diff --git a/Zend/tests/arginfo_zpp_mismatch.phpt b/Zend/tests/arginfo_zpp_mismatch.phpt
index 9762dd5fce6..39a17427439 100644
--- a/Zend/tests/arginfo_zpp_mismatch.phpt
+++ b/Zend/tests/arginfo_zpp_mismatch.phpt
@@ -3,10 +3,27 @@ Test that there is no arginfo/zpp mismatch
 --FILE--
 <?php
 
-foreach (get_defined_functions()["internal"] as $function) {
+function test($function) {
     try {
         @$function(null, null, null, null, null, null, null, null);
-    } catch (ArgumentCountError|Error) {
+    } catch (Throwable) {
+    }
+}
+
+foreach (get_defined_functions()["internal"] as $function) {
+    test($function);
+}
+
+foreach (get_declared_classes() as $class) {
+    try {
+        $rc = new ReflectionClass($class);
+        $obj = $rc->newInstanceWithoutConstructor();
+    } catch (Throwable) {
+        continue;
+    }
+
+    foreach (get_class_methods($class) as $method) {
+        test([$obj, $method]);
     }
 }