diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c9ee9897e..23e056f13 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ ubuntu-latest ]
-        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         dependencies: [ 'locked' ]
 
     name: PHP ${{ matrix.php }} on ${{ matrix.operating-system }} with ${{ matrix.dependencies }} dependencies
diff --git a/tests/PEAR_ErrorStack/test_global_context_createfunction.phpt b/tests/PEAR_ErrorStack/test_global_context_createfunction.phpt
index bfb45abc9..db80fcf0a 100644
--- a/tests/PEAR_ErrorStack/test_global_context_createfunction.phpt
+++ b/tests/PEAR_ErrorStack/test_global_context_createfunction.phpt
@@ -15,11 +15,12 @@ $testline = __LINE__ - 1;
 $a();
 
 $ret = $stack->pop();
-$phpunit->assertEquals(array('file' => __FILE__,
-      'line' => $testline,
-      'function' => '{closure}',
-), $ret['context'], 'context');
-echo 'tests done';
+print_r($ret['context']);
 ?>
---EXPECT--
-tests done
+--EXPECTF--
+Array
+(
+    [file] => %s/test_global_context_createfunction.php
+    [line] => 4
+    [function] => {closur%s}
+)
diff --git a/tests/PEAR_ErrorStack/test_global_context_createfunction_staticPush.phpt b/tests/PEAR_ErrorStack/test_global_context_createfunction_staticPush.phpt
index 8885acd43..8256109b3 100644
--- a/tests/PEAR_ErrorStack/test_global_context_createfunction_staticPush.phpt
+++ b/tests/PEAR_ErrorStack/test_global_context_createfunction_staticPush.phpt
@@ -15,11 +15,12 @@ $testline = __LINE__ - 1;
 $a();
 
 $ret = $stack->pop();
-$phpunit->assertEquals(array('file' => __FILE__,
-      'line' => $testline,
-      'function' => '{closure}',
-), $ret['context'], 'context');
-echo 'tests done';
+print_r($ret['context']);
 ?>
---EXPECT--
-tests done
+--EXPECTF--
+Array
+(
+    [file] => %s/test_global_context_createfunction_staticPush.php
+    [line] => 4
+    [function] => {closur%s}
+)
diff --git a/tests/PEAR_ErrorStack/test_infunction_context_createfunction.phpt b/tests/PEAR_ErrorStack/test_infunction_context_createfunction.phpt
index a14c8d994..4ae822994 100644
--- a/tests/PEAR_ErrorStack/test_infunction_context_createfunction.phpt
+++ b/tests/PEAR_ErrorStack/test_infunction_context_createfunction.phpt
@@ -20,11 +20,12 @@ function test7()
 test7();
 
 $ret = $stack->pop();
-$phpunit->assertEquals(array('file' => __FILE__,
-      'line' => $testline,
-      'function' => '{closure}',
-), $ret['context'], 'context');
-echo 'tests done';
+print_r($ret['context']);
 ?>
---EXPECT--
-tests done
+--EXPECTF--
+Array
+(
+    [file] => %s/test_infunction_context_createfunction.php
+    [line] => 4
+    [function] => {closur%s}
+)
diff --git a/tests/PEAR_ErrorStack/test_infunction_context_createfunction_staticPush.phpt b/tests/PEAR_ErrorStack/test_infunction_context_createfunction_staticPush.phpt
index 4a728b723..d536ff4ca 100644
--- a/tests/PEAR_ErrorStack/test_infunction_context_createfunction_staticPush.phpt
+++ b/tests/PEAR_ErrorStack/test_infunction_context_createfunction_staticPush.phpt
@@ -20,11 +20,12 @@ function test7()
 test7();
 
 $ret = $stack->pop();
-$phpunit->assertEquals(array('file' => __FILE__,
-      'line' => $testline,
-      'function' => '{closure}',
-), $ret['context'], 'context');
-echo 'tests done';
+print_r($ret['context']);
 ?>
---EXPECT--
-tests done
+--EXPECTF--
+Array
+(
+    [file] => %s/test_infunction_context_createfunction_staticPush.php
+    [line] => 4
+    [function] => {closur%s}
+)
diff --git a/tests/PEAR_ErrorStack/test_inmethod_context_createfunction.phpt b/tests/PEAR_ErrorStack/test_inmethod_context_createfunction.phpt
index 7c54889d3..0555e7cad 100644
--- a/tests/PEAR_ErrorStack/test_inmethod_context_createfunction.phpt
+++ b/tests/PEAR_ErrorStack/test_inmethod_context_createfunction.phpt
@@ -24,11 +24,12 @@ $z = new test8;
 $z->test7();
 
 $ret = $stack->pop();
-$phpunit->assertEquals(array('file' => __FILE__,
-      'line' => $testline,
-      'function' => '{closure}',
-), $ret['context'], 'context');
-echo 'tests done';
+print_r($ret['context']);
 ?>
---EXPECT--
-tests done
+--EXPECTF--
+Array
+(
+    [file] => %s/test_inmethod_context_createfunction.php
+    [line] => 4
+    [function] => {closur%s}
+)
diff --git a/tests/PEAR_ErrorStack/test_inmethod_context_createfunction_staticPush.phpt b/tests/PEAR_ErrorStack/test_inmethod_context_createfunction_staticPush.phpt
index d968491ec..c883153ab 100644
--- a/tests/PEAR_ErrorStack/test_inmethod_context_createfunction_staticPush.phpt
+++ b/tests/PEAR_ErrorStack/test_inmethod_context_createfunction_staticPush.phpt
@@ -24,11 +24,12 @@ $z = new test8;
 $z->test7();
 
 $ret = $stack->pop();
-$phpunit->assertEquals(array('file' => __FILE__,
-      'line' => $testline,
-      'function' => '{closure}',
-), $ret['context'], 'context');
-echo 'tests done';
+print_r($ret['context']);
 ?>
---EXPECT--
-tests done
+--EXPECTF--
+Array
+(
+    [file] => %s/test_inmethod_context_createfunction_staticPush.php
+    [line] => 4
+    [function] => {closur%s}
+)
diff --git a/tests/PEAR_ErrorStack/test_instaticmethod_context_createfunction.phpt b/tests/PEAR_ErrorStack/test_instaticmethod_context_createfunction.phpt
index bd5b2ce0f..6d8ad30d0 100644
--- a/tests/PEAR_ErrorStack/test_instaticmethod_context_createfunction.phpt
+++ b/tests/PEAR_ErrorStack/test_instaticmethod_context_createfunction.phpt
@@ -23,11 +23,12 @@ class test8
 test8::test7();
 
 $ret = $stack->pop();
-$phpunit->assertEquals(array('file' => __FILE__,
-      'line' => $testline,
-      'function' => '{closure}',
-), $ret['context'], 'context');
-echo 'tests done';
+print_r($ret['context']);
 ?>
---EXPECT--
-tests done
+--EXPECTF--
+Array
+(
+    [file] => %s/test_instaticmethod_context_createfunction.php
+    [line] => 4
+    [function] => {closur%s}
+)
diff --git a/tests/PEAR_ErrorStack/test_instaticmethod_context_createfunction_staticPush.phpt b/tests/PEAR_ErrorStack/test_instaticmethod_context_createfunction_staticPush.phpt
index 0b9c58664..b89385aad 100644
--- a/tests/PEAR_ErrorStack/test_instaticmethod_context_createfunction_staticPush.phpt
+++ b/tests/PEAR_ErrorStack/test_instaticmethod_context_createfunction_staticPush.phpt
@@ -23,11 +23,12 @@ class test8
 test8::test7();
 
 $ret = $stack->pop();
-$phpunit->assertEquals(array('file' => __FILE__,
-      'line' => $testline,
-      'function' => '{closure}',
-), $ret['context'], 'context');
-echo 'tests done';
+print_r($ret['context']);
 ?>
---EXPECT--
-tests done
+--EXPECTF--
+Array
+(
+    [file] => %s/test_instaticmethod_context_createfunction_staticPush.php
+    [line] => 4
+    [function] => {closur%s}
+)