diff --git a/tests/CoreStubsTest.php b/tests/CoreStubsTest.php
index 142be4a3e8a..c388fc12913 100644
--- a/tests/CoreStubsTest.php
+++ b/tests/CoreStubsTest.php
@@ -192,7 +192,7 @@ function foo(string $foo): string
                 '$c3===' => 'bool',
             ],
         ];
-        yield 'PHP8 str_* function assert non-empty-string' => [
+        yield 'PHP80-str_* function assert non-empty-string' => [
             'code' => '<?php
                 /** @return non-empty-string */
                 function after_str_contains(): string
@@ -258,7 +258,7 @@ function after_stripos(): string
                 '$e===' => 'non-empty-string',
             ],
         ];
-        yield "PHP8 str_* function doesn't subtract string after assertion" => [
+        yield "PHP80-str_* function doesn't subtract string after assertion" => [
             'code' => '<?php
                 /** @return false|string */
                 function after_str_contains()
diff --git a/tests/Traits/InvalidCodeAnalysisTestTrait.php b/tests/Traits/InvalidCodeAnalysisTestTrait.php
index f37d0033584..b837c40a0e2 100644
--- a/tests/Traits/InvalidCodeAnalysisTestTrait.php
+++ b/tests/Traits/InvalidCodeAnalysisTestTrait.php
@@ -49,17 +49,25 @@ public function testInvalidCode(
         string $code,
         string $error_message,
         array  $error_levels = [],
-        string $php_version = '7.4'
+        ?string $php_version = null
     ): void {
         $test_name = $this->getTestName();
         if (strpos($test_name, 'PHP80-') !== false) {
             if (version_compare(PHP_VERSION, '8.0.0', '<')) {
                 $this->markTestSkipped('Test case requires PHP 8.0.');
             }
+
+            if ($php_version === null) {
+                $php_version = '8.0';
+            }
         } elseif (strpos($test_name, 'SKIPPED-') !== false) {
             $this->markTestSkipped('Skipped due to a bug.');
         }
 
+        if ($php_version === null) {
+            $php_version = '7.4';
+        }
+
         // sanity check - do we have a PHP tag?
         if (strpos($code, '<?php') === false) {
             $this->fail('Test case must have a <?php tag');
diff --git a/tests/Traits/ValidCodeAnalysisTestTrait.php b/tests/Traits/ValidCodeAnalysisTestTrait.php
index 7a76481d275..370206423a9 100644
--- a/tests/Traits/ValidCodeAnalysisTestTrait.php
+++ b/tests/Traits/ValidCodeAnalysisTestTrait.php
@@ -40,21 +40,33 @@ public function testValidCode(
         string $code,
         array $assertions = [],
         array $ignored_issues = [],
-        string $php_version = '7.4'
+        ?string $php_version = null
     ): void {
         $test_name = $this->getTestName();
         if (strpos($test_name, 'PHP80-') !== false) {
             if (version_compare(PHP_VERSION, '8.0.0', '<')) {
                 $this->markTestSkipped('Test case requires PHP 8.0.');
             }
+
+            if ($php_version === null) {
+                $php_version = '8.0';
+            }
         } elseif (strpos($test_name, 'PHP81-') !== false) {
             if (version_compare(PHP_VERSION, '8.1.0', '<')) {
                 $this->markTestSkipped('Test case requires PHP 8.1.');
             }
+
+            if ($php_version === null) {
+                $php_version = '8.1';
+            }
         } elseif (strpos($test_name, 'SKIPPED-') !== false) {
             $this->markTestSkipped('Skipped due to a bug.');
         }
 
+        if ($php_version === null) {
+            $php_version = '7.4';
+        }
+
         // sanity check - do we have a PHP tag?
         if (strpos($code, '<?php') === false) {
             $this->fail('Test case must have a <?php tag');