diff --git a/PHPUnit/Framework/TestResult.php b/PHPUnit/Framework/TestResult.php
index 103e0a505b4..35602c7ba8e 100644
--- a/PHPUnit/Framework/TestResult.php
+++ b/PHPUnit/Framework/TestResult.php
@@ -580,9 +580,13 @@ public function run(PHPUnit_Framework_Test $test)
         $errorHandlerSet = FALSE;
 
         if ($this->convertErrorsToExceptions) {
+            $errorLevels = E_ALL;
+            if (PHP_VERSION_ID < 70400) {
+                $errorLevels = E_ALL | E_STRICT;
+            }
             $oldErrorHandler = set_error_handler(
-              array('PHPUnit_Util_ErrorHandler', 'handleError'),
-              E_ALL | E_STRICT
+                array('PHPUnit_Util_ErrorHandler', 'handleError'),
+                $errorLevels
             );
 
             if ($oldErrorHandler === NULL) {
diff --git a/PHPUnit/Util/ErrorHandler.php b/PHPUnit/Util/ErrorHandler.php
index be311b04294..2737bd7c93d 100644
--- a/PHPUnit/Util/ErrorHandler.php
+++ b/PHPUnit/Util/ErrorHandler.php
@@ -99,7 +99,8 @@ public static function handleError($errno, $errstr, $errfile, $errline)
             }
         }
 
-        if ($errno == E_NOTICE || $errno == E_USER_NOTICE || $errno == E_STRICT) {
+        if ($errno == E_NOTICE || $errno == E_USER_NOTICE
+            || (PHP_VERSION_ID < 70400 && $errno == E_STRICT)) {
             if (PHPUnit_Framework_Error_Notice::$enabled !== TRUE) {
                 return FALSE;
             }