diff --git a/core/modules/config/lib/Drupal/config/Tests/LocaleConfigOverride.php b/core/modules/config/lib/Drupal/config/Tests/LocaleConfigOverrideTest.php
similarity index 88%
rename from core/modules/config/lib/Drupal/config/Tests/LocaleConfigOverride.php
rename to core/modules/config/lib/Drupal/config/Tests/LocaleConfigOverrideTest.php
index adfe0b9..ba31013 100644
--- a/core/modules/config/lib/Drupal/config/Tests/LocaleConfigOverride.php
+++ b/core/modules/config/lib/Drupal/config/Tests/LocaleConfigOverrideTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\LocaleConfigOverride.
+ * Definition of Drupal\config\Tests\LocaleConfigOverrideTest.
  */
 
 namespace Drupal\config\Tests;
@@ -12,7 +12,7 @@
 /**
  * Tests locale config override.
  */
-class LocaleConfigOverride extends WebTestBase {
+class LocaleConfigOverrideTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionTest.php
similarity index 98%
rename from core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php
rename to core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionTest.php
index 80a835d..2d5f515 100644
--- a/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Tests\LanguageBrowserDetectionUnitTest.
+ * Definition of Drupal\language\Tests\LanguageBrowserDetectionTest.
  */
 
 namespace Drupal\language\Tests;
@@ -13,7 +13,7 @@
 /**
  * Test browser language detection.
  */
-class LanguageBrowserDetectionUnitTest extends WebTestBase {
+class LanguageBrowserDetectionTest extends WebTestBase {
 
   public static $modules = array('language');
 
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleFileImportStatus.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleFileImportStatusTest.php
similarity index 98%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleFileImportStatus.php
rename to core/modules/locale/lib/Drupal/locale/Tests/LocaleFileImportStatusTest.php
index 06d292f..687a992 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleFileImportStatus.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleFileImportStatusTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\Tests\LocaleFileImportStatus.
+ * Definition of Drupal\locale\Tests\LocaleFileImportStatusTest.
  */
 
 namespace Drupal\locale\Tests;
@@ -12,7 +12,7 @@
 /**
  * Functional tests for the import of translation files.
  */
-class LocaleFileImportStatus extends WebTestBase {
+class LocaleFileImportStatusTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleJavascriptTranslation.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleJavascriptTranslationTest.php
similarity index 98%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleJavascriptTranslation.php
rename to core/modules/locale/lib/Drupal/locale/Tests/LocaleJavascriptTranslationTest.php
index d8e028f..e4ab16a 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleJavascriptTranslation.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleJavascriptTranslationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\Tests\LocaleJavascriptTranslation.
+ * Definition of Drupal\locale\Tests\LocaleJavascriptTranslationTest.
  */
 
 namespace Drupal\locale\Tests;
@@ -12,7 +12,7 @@
 /**
  * Functional tests for JavaScript parsing for translatable strings.
  */
-class LocaleJavascriptTranslation extends WebTestBase {
+class LocaleJavascriptTranslationTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleEnable.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleEnableTest.php
similarity index 91%
rename from core/modules/system/lib/Drupal/system/Tests/Module/ModuleEnable.php
rename to core/modules/system/lib/Drupal/system/Tests/Module/ModuleEnableTest.php
index b2d08fc..38e33da 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleEnable.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleEnableTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Module\ModuleEnable.
+ * Contains Drupal\system\Tests\Module\ModuleEnableTest.
  */
 
 namespace Drupal\system\Tests\Module;
@@ -12,7 +12,7 @@
 /**
  * Tests module_enable().
  */
-class ModuleEnable extends WebTestBase {
+class ModuleEnableTest extends WebTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/FirstEntryFinalMatcherTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/FirstEntryFinalMatcherTest.php
index a288b9e..dcc8c9b 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/FirstEntryFinalMatcherTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/FirstEntryFinalMatcherTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\NestedMatcherTest.
+ * Definition of Drupal\system\Tests\Routing\FirstEntryFinalMatcherTest.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherTest.php
index c98da2e..88d5a14 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\HttpMethodMMatcherTest.
+ * Definition of Drupal\system\Tests\Routing\HttpMethodMatcherTest.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php
index 7f6f312..a878e00 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\UrlMatcherDumperTest.
+ * Definition of Drupal\system\Tests\Routing\MatcherDumperTest.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherTest.php
index 0780250..3c28103 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\PartialMatcherTest.
+ * Definition of Drupal\system\Tests\Routing\PathMatcherTest.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php b/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTest.php
similarity index 97%
rename from core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
rename to core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTest.php
index 8b79b69..c400a7b 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserAccountLinksTests.
+ * Definition of Drupal\user\Tests\UserAccountLinksTest.
  */
 
 namespace Drupal\user\Tests;
@@ -12,7 +12,7 @@
 /**
  * Tests user links in the secondary menu.
  */
-class UserAccountLinksTests extends WebTestBase {
+class UserAccountLinksTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php b/core/modules/user/lib/Drupal/user/Tests/UserBlocksTest.php
similarity index 97%
rename from core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php
rename to core/modules/user/lib/Drupal/user/Tests/UserBlocksTest.php
index ed8ad5a..b698f12 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserBlocksTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserBlocksTests.
+ * Definition of Drupal\user\Tests\UserBlocksTest.
  */
 
 namespace Drupal\user\Tests;
@@ -12,7 +12,7 @@
 /**
  * Test user blocks.
  */
-class UserBlocksTests extends WebTestBase {
+class UserBlocksTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Comment/DefaultViewRecentComments.php b/core/modules/views/lib/Drupal/views/Tests/Comment/DefaultViewRecentCommentsTest.php
similarity index 98%
rename from core/modules/views/lib/Drupal/views/Tests/Comment/DefaultViewRecentComments.php
rename to core/modules/views/lib/Drupal/views/Tests/Comment/DefaultViewRecentCommentsTest.php
index 73ddfe0..5d23059 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Comment/DefaultViewRecentComments.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Comment/DefaultViewRecentCommentsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Comment\DefaultViewRecentComments.
+ * Definition of Drupal\views\Tests\Comment\DefaultViewRecentCommentsTest.
  */
 
 namespace Drupal\views\Tests\Comment;
@@ -10,7 +10,7 @@
 use Drupal\entity\DatabaseStorageController;
 use  Drupal\views\Tests\ViewTestBase;
 
-class DefaultViewRecentComments extends ViewTestBase {
+class DefaultViewRecentCommentsTest extends ViewTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Taxonomy/RelationshipRepresentativeNode.php b/core/modules/views/lib/Drupal/views/Tests/Taxonomy/RelationshipRepresentativeNodeTest.php
similarity index 92%
rename from core/modules/views/lib/Drupal/views/Tests/Taxonomy/RelationshipRepresentativeNode.php
rename to core/modules/views/lib/Drupal/views/Tests/Taxonomy/RelationshipRepresentativeNodeTest.php
index 70a9c99..6be5792 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Taxonomy/RelationshipRepresentativeNode.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Taxonomy/RelationshipRepresentativeNodeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Taxonomy\RelationshipRepresentativeNode.
+ * Definition of Drupal\views\Tests\Taxonomy\RelationshipRepresentativeNodeTest.
  */
 
 namespace Drupal\views\Tests\Taxonomy;
@@ -10,7 +10,7 @@
 /**
  * Tests the representative node relationship for terms.
  */
-class RelationshipRepresentativeNode extends TaxonomyTestBase {
+class RelationshipRepresentativeNodeTest extends TaxonomyTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/User/RelationshipRepresentativeNode.php b/core/modules/views/lib/Drupal/views/Tests/User/RelationshipRepresentativeNodeTest.php
similarity index 92%
rename from core/modules/views/lib/Drupal/views/Tests/User/RelationshipRepresentativeNode.php
rename to core/modules/views/lib/Drupal/views/Tests/User/RelationshipRepresentativeNodeTest.php
index a46965c..29ad1e9 100644
--- a/core/modules/views/lib/Drupal/views/Tests/User/RelationshipRepresentativeNode.php
+++ b/core/modules/views/lib/Drupal/views/Tests/User/RelationshipRepresentativeNodeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\User\RelationshipRepresentativeNode.
+ * Definition of Drupal\views\Tests\User\RelationshipRepresentativeNodeTest.
  */
 
 namespace Drupal\views\Tests\User;
@@ -10,7 +10,7 @@
 /**
  * Tests the representative node relationship for users.
  */
-class RelationshipRepresentativeNode extends UserTestBase {
+class RelationshipRepresentativeNodeTest extends UserTestBase {
 
   public static function getInfo() {
     return array(