diff --git a/tests/AnnotationTest.php b/tests/AnnotationTest.php
index f31e4e284..0ec80b9c4 100644
--- a/tests/AnnotationTest.php
+++ b/tests/AnnotationTest.php
@@ -450,7 +450,7 @@ class AnnotationTest extends TestCase
 
                     $a = new A();
                     $a->foo = 5;',
-                'error_message' => 'InvalidPropertyAssignment',
+                'error_message' => 'InvalidPropertyAssignmentValue',
             ],
             'propertyWriteDocblockInvalidAssignment' => [
                 '<?php
@@ -471,7 +471,7 @@ class AnnotationTest extends TestCase
 
                     $a = new A();
                     $a->foo = 5;',
-                'error_message' => 'InvalidPropertyAssignment',
+                'error_message' => 'InvalidPropertyAssignmentValue',
             ],
             'propertySealedDocblockUndefinedPropertyAssignment' => [
                 '<?php
@@ -515,7 +515,7 @@ class AnnotationTest extends TestCase
 
                     $a = new A();
                     $a->foo = 5;',
-                'error_message' => 'InvalidPropertyAssignment',
+                'error_message' => 'InvalidPropertyAssignmentValue',
             ],
             'propertyReadInvalidFetch' => [
                 '<?php
@@ -664,7 +664,7 @@ class AnnotationTest extends TestCase
                             $this->foo["boof"] = "hello";
                         }
                     }',
-                'error_message' => 'InvalidPropertyAssignment',
+                'error_message' => 'InvalidPropertyAssignmentValue',
             ],
             'incorrectDocblockOrder' => [
                 '<?php
diff --git a/tests/ArrayAssignmentTest.php b/tests/ArrayAssignmentTest.php
index e017f886f..6d6aa4eed 100644
--- a/tests/ArrayAssignmentTest.php
+++ b/tests/ArrayAssignmentTest.php
@@ -819,7 +819,7 @@ class ArrayAssignmentTest extends TestCase
                             $this->strs = [new stdClass()]; // no issue emitted
                         }
                     }',
-                'error_message' => 'InvalidPropertyAssignment',
+                'error_message' => 'InvalidPropertyAssignmentValue',
             ],
             'incrementalArrayPropertyAssignment' => [
                 '<?php
@@ -832,7 +832,7 @@ class ArrayAssignmentTest extends TestCase
                             $this->strs[] = new stdClass(); // no issue emitted
                         }
                     }',
-                'error_message' => 'InvalidPropertyAssignment',
+                'error_message' => 'InvalidPropertyAssignmentValue',
             ],
         ];
     }
diff --git a/tests/MethodSignatureTest.php b/tests/MethodSignatureTest.php
index 14db549cd..ba66ecc2c 100644
--- a/tests/MethodSignatureTest.php
+++ b/tests/MethodSignatureTest.php
@@ -221,7 +221,7 @@ class MethodSignatureTest extends TestCase
                         }
                     }',
                 'error_message' => 'Argument 1 of B::fooFoo has wrong type \'bool\', expecting \'int\' as defined ' .
-                    'by A::foo',
+                    'by A::fooFoo',
             ],
             'nonNullableSubclassParam' => [
                 '<?php
@@ -236,7 +236,7 @@ class MethodSignatureTest extends TestCase
                             return $s;
                         }
                     }',
-                'error_message' => 'Argument 1 of B::foo has wrong type \'string\', expecting \'string|null\'',
+                'error_message' => 'Argument 1 of B::foo has wrong type \'string\', expecting \'string|null\' as',
             ],
             'mismatchingCovariantReturn' => [
                 '<?php