diff --git a/core/modules/simpletest/simpletest.test b/core/modules/simpletest/simpletest.test
index cc4e026cd2f10ec07ccc105a27834ab5ec4cb21d..96569212b0c35941a0a8db67a895b8b321976c46 100644
--- a/core/modules/simpletest/simpletest.test
+++ b/core/modules/simpletest/simpletest.test
@@ -635,7 +635,7 @@ class SimpleTestInstallationProfileModuleTestsTestCase extends WebTestBase {
    * - but still install the drupal_system_listing_compatible_test.module
    *   contained in the Testing profile.
    *
-   * @see DrupalSystemListingCompatibleTestCase
+   * @see Drupal\drupal_system_listing_compatible_test\Tests\SystemListingCompatibleTest
    */
   protected $profile = 'testing';
 
@@ -661,10 +661,10 @@ class SimpleTestInstallationProfileModuleTestsTestCase extends WebTestBase {
     $this->drupalGet('admin/config/development/testing');
     $this->assertText('Installation profile module tests helper');
     $edit = array(
-      'DrupalSystemListingCompatibleTestCase' => TRUE,
+      'Drupal\drupal_system_listing_compatible_test\Tests\SystemListingCompatibleTest' => TRUE,
     );
     $this->drupalPost(NULL, $edit, t('Run tests'));
-    $this->assertText('DrupalSystemListingCompatibleTestCase test executed.');
+    $this->assertText('SystemListingCompatibleTest test executed.');
   }
 }
 
@@ -681,7 +681,7 @@ class SimpleTestOtherInstallationProfileModuleTestsTestCase extends WebTestBase
    * which should not be found.
    *
    * @see SimpleTestInstallationProfileModuleTestsTestCase
-   * @see DrupalSystemListingCompatibleTestCase
+   * @see Drupal\drupal_system_listing_compatible_test\Tests\SystemListingCompatibleTest
    */
   protected $profile = 'minimal';
 
diff --git a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
index 9ce4ca1b015c5656aacff66d99f3c4b68a135fde..53515e769e3a6b413378d9484c8ddcab3604be2f 100644
--- a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
+++ b/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
@@ -4,4 +4,3 @@ package = Testing
 version = VERSION
 core = 8.x
 hidden = TRUE
-files[] = drupal_system_listing_compatible_test.test
diff --git a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.test b/profiles/testing/modules/drupal_system_listing_compatible_test/lib/Drupal/drupal_system_listing_compatible_test/Tests/SystemListingCompatibleTest.php
similarity index 79%
rename from profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.test
rename to profiles/testing/modules/drupal_system_listing_compatible_test/lib/Drupal/drupal_system_listing_compatible_test/Tests/SystemListingCompatibleTest.php
index e4c8694046254855a6052b86be4fcab0ab03c3f0..32b8fc70206112fddac4dee7fdf3b0dbfff20744 100644
--- a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.test
+++ b/profiles/testing/modules/drupal_system_listing_compatible_test/lib/Drupal/drupal_system_listing_compatible_test/Tests/SystemListingCompatibleTest.php
@@ -1,12 +1,17 @@
 <?php
 
+/**
+ * Definition of Drupal\drupal_system_listing_compatible_test\Tests\SystemListingCompatibleTest.
+ */
+
+namespace Drupal\drupal_system_listing_compatible_test\Tests;
 
 use Drupal\simpletest\WebTestBase;
 
 /**
  * Helper to verify tests in installation profile modules.
  */
-class DrupalSystemListingCompatibleTestCase extends WebTestBase {
+class SystemListingCompatibleTest extends WebTestBase {
   /**
    * Use the Minimal profile.
    *
@@ -34,7 +39,7 @@ function setUp() {
   /**
    * Non-empty test* method required to executed the test case class.
    */
-  function testDrupalSystemListing() {
+  function testSystemListing() {
     $this->pass(__CLASS__ . ' test executed.');
   }
 }