diff --git a/core/modules/system/src/Tests/Module/DependencyTest.php b/core/modules/system/src/Tests/Module/DependencyTest.php
index 69ee53a..b6e5f47 100644
--- a/core/modules/system/src/Tests/Module/DependencyTest.php
+++ b/core/modules/system/src/Tests/Module/DependencyTest.php
@@ -102,9 +102,9 @@ public function testIncompatiblePhpVersionDependency() {
     // Test that the system_incompatible_php_version_dependencies_test is
     // marked as having an incompatible dependency.
     $this->drupalGet('admin/modules');
-    $this->assertRaw(t('This module requires PHP version @php_required and is incompatible with PHP version !php_version.', array(
-      '@php_required' => 6502,
-      '!php_version' => phpversion(),
+    $this->assertRaw(t('This module requires PHP version @php_required and is incompatible with PHP version @php_version.', array(
+      '@php_required' => '6502.*',
+      '@php_version' => phpversion(),
     )), 'A module that depends on a module with an incompatible PHP version is marked as such.');
     $checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[Testing][system_incompatible_core_version_dependencies_test][enable]"]');
     $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.');
diff --git a/core/modules/system/tests/modules/system_incompatible_php_version_dependencies_test/system_incompatible_core_version_dependencies_test.info.yml b/core/modules/system/tests/modules/system_incompatible_php_version_dependencies_test/system_incompatible_core_version_dependencies_test.info.yml
deleted file mode 100644
index e7b86b5..0000000
--- a/core/modules/system/tests/modules/system_incompatible_php_version_dependencies_test/system_incompatible_core_version_dependencies_test.info.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: 'System incompatible PHP version dependencies test'
-type: module
-description: 'Support module for testing system dependencies.'
-package: Testing
-version: VERSION
-core: 8.x
-dependencies:
-  - system_incompatible_php_version_test
diff --git a/core/modules/system/tests/modules/system_incompatible_php_version_dependencies_test/system_incompatible_php_version_dependencies_test.info.yml b/core/modules/system/tests/modules/system_incompatible_php_version_dependencies_test/system_incompatible_php_version_dependencies_test.info.yml
new file mode 100644
index 0000000..e7b86b5
--- /dev/null
+++ b/core/modules/system/tests/modules/system_incompatible_php_version_dependencies_test/system_incompatible_php_version_dependencies_test.info.yml
@@ -0,0 +1,8 @@
+name: 'System incompatible PHP version dependencies test'
+type: module
+description: 'Support module for testing system dependencies.'
+package: Testing
+version: VERSION
+core: 8.x
+dependencies:
+  - system_incompatible_php_version_test
diff --git a/core/modules/system/tests/modules/system_incompatible_php_version_test/system_incompatible_core_version_test.info.yml b/core/modules/system/tests/modules/system_incompatible_php_version_test/system_incompatible_core_version_test.info.yml
deleted file mode 100644
index a3a26ee..0000000
--- a/core/modules/system/tests/modules/system_incompatible_php_version_test/system_incompatible_core_version_test.info.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 'System incompatible PHP version test'
-type: module
-description: 'Support module for testing system dependencies.'
-package: Testing
-version: VERSION
-core: 8.x
-php: 6502
diff --git a/core/modules/system/tests/modules/system_incompatible_php_version_test/system_incompatible_php_version_test.info.yml b/core/modules/system/tests/modules/system_incompatible_php_version_test/system_incompatible_php_version_test.info.yml
new file mode 100644
index 0000000..a3a26ee
--- /dev/null
+++ b/core/modules/system/tests/modules/system_incompatible_php_version_test/system_incompatible_php_version_test.info.yml
@@ -0,0 +1,7 @@
+name: 'System incompatible PHP version test'
+type: module
+description: 'Support module for testing system dependencies.'
+package: Testing
+version: VERSION
+core: 8.x
+php: 6502