5 files changed, 10 insertions, 11 deletions
diff --git a/Zend/tests/attributes/003_ast_nodes.phpt b/Zend/tests/attributes/003_ast_nodes.phpt
index 5bfffb8100..afdab838f8 100644
--- a/Zend/tests/attributes/003_ast_nodes.phpt
+++ b/Zend/tests/attributes/003_ast_nodes.phpt
@@ -104,6 +104,5 @@ array(1) {
 }
 
 int(1)
-string(30) "Class 'MissingClass' not found"
-string(30) "Class 'MissingClass' not found"
-
+string(30) "Class "MissingClass" not found"
+string(30) "Class "MissingClass" not found"
diff --git a/Zend/tests/attributes/005_objects.phpt b/Zend/tests/attributes/005_objects.phpt
index f213ed54b6..712ec93bea 100644
--- a/Zend/tests/attributes/005_objects.phpt
+++ b/Zend/tests/attributes/005_objects.phpt
@@ -108,13 +108,13 @@ string(7) "ERROR 2"
 string(74) "A1::__construct(): Argument #1 ($name) must be of type string, array given"
 
 string(7) "ERROR 3"
-string(30) "Attribute class 'A2' not found"
+string(30) "Attribute class "A2" not found"
 
 string(7) "ERROR 4"
-string(50) "Attribute constructor of class 'A3' must be public"
+string(48) "Attribute constructor of class A3 must be public"
 
 string(7) "ERROR 5"
-string(71) "Attribute class 'A4' does not have a constructor, cannot pass arguments"
+string(69) "Attribute class A4 does not have a constructor, cannot pass arguments"
 
 string(7) "ERROR 6"
-string(55) "Attempting to use non-attribute class 'A5' as attribute"
+string(55) "Attempting to use non-attribute class "A5" as attribute"
diff --git a/Zend/tests/attributes/006_filter.phpt b/Zend/tests/attributes/006_filter.phpt
index 2b7cc9dcdb..49c02d6e35 100644
--- a/Zend/tests/attributes/006_filter.phpt
+++ b/Zend/tests/attributes/006_filter.phpt
@@ -109,4 +109,4 @@ Array
 string(7) "ERROR 1"
 string(103) "ReflectionFunctionAbstract::getAttributes(): Argument #2 ($flags) must be a valid attribute filter flag"
 string(7) "ERROR 2"
-string(34) "Class 'SomeMissingClass' not found"
+string(34) "Class "SomeMissingClass" not found"
diff --git a/Zend/tests/attributes/013_class_scope.phpt b/Zend/tests/attributes/013_class_scope.phpt
index 3bb2b303ba..94764c2d69 100644
--- a/Zend/tests/attributes/013_class_scope.phpt
+++ b/Zend/tests/attributes/013_class_scope.phpt
@@ -34,7 +34,7 @@ trait T1
 class C2
 {
 	use T1;
-	
+
 	private const FOO = 'bar';
 }
 
@@ -109,7 +109,7 @@ Array
     [1] => bar
 )
 string(7) "ERROR 1"
-string(36) "Undefined class constant 'self::FOO'"
+string(28) "Undefined constant self::FOO"
 
 bool(true)
 string(3) "bar"
diff --git a/Zend/tests/attributes/023_ast_node_in_validation.phpt b/Zend/tests/attributes/023_ast_node_in_validation.phpt
index af0d0b767d..57a7287cae 100644
--- a/Zend/tests/attributes/023_ast_node_in_validation.phpt
+++ b/Zend/tests/attributes/023_ast_node_in_validation.phpt
@@ -8,4 +8,4 @@ class A1 { }
 
 ?>
 --EXPECTF--
-Fatal error: Class 'Foo' not found in %s
+Fatal error: Class "Foo" not found in %s on line %d