diff --git a/core/modules/comment/src/Tests/Views/DefaultViewRecentComments.php b/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
similarity index 98%
rename from core/modules/comment/src/Tests/Views/DefaultViewRecentComments.php
rename to core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
index 9bf8e5b..b6fdce3 100644
--- a/core/modules/comment/src/Tests/Views/DefaultViewRecentComments.php
+++ b/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Views\DefaultViewRecentComments.
+ * Contains \Drupal\comment\Tests\Views\DefaultViewRecentCommentsTest.
  */
 
 namespace Drupal\comment\Tests\Views;
@@ -14,7 +14,7 @@
 /**
  * Tests the Recent Comments default view.
  */
-class DefaultViewRecentComments extends ViewTestBase {
+class DefaultViewRecentCommentsTest extends ViewTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/tests/src/Menu/LanguageLocalTasks.php b/core/modules/language/tests/src/Menu/LanguageLocalTasksTest.php
similarity index 91%
rename from core/modules/language/tests/src/Menu/LanguageLocalTasks.php
rename to core/modules/language/tests/src/Menu/LanguageLocalTasksTest.php
index 8ec2313..8770e62 100644
--- a/core/modules/language/tests/src/Menu/LanguageLocalTasks.php
+++ b/core/modules/language/tests/src/Menu/LanguageLocalTasksTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language\Tests\Menu\LanguageLocalTasks.
+ * Contains \Drupal\language\Tests\Menu\LanguageLocalTasksTest.
  */
 
 namespace Drupal\language\Tests\Menu;
@@ -15,7 +15,7 @@
  * @group Drupal
  * @group language
  */
-class LanguageLocalTasks extends LocalTaskIntegrationTest {
+class LanguageLocalTasksTest extends LocalTaskIntegrationTest {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/locale/src/Tests/LocaleJavascriptTranslation.php b/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
similarity index 96%
rename from core/modules/locale/src/Tests/LocaleJavascriptTranslation.php
rename to core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
index 8356693..5a20769 100644
--- a/core/modules/locale/src/Tests/LocaleJavascriptTranslation.php
+++ b/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\Tests\LocaleJavascriptTranslation.
+ * Contains \Drupal\locale\Tests\LocaleJavascriptTranslationTest.
  */
 
 namespace Drupal\locale\Tests;
@@ -13,7 +13,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/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityDisplay.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityDisplayTest.php
similarity index 90%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityDisplay.php
rename to core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityDisplayTest.php
index 4d9ca86..0e1a171 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityDisplay.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityDisplayTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateCommentVariableEntityDisplay.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateCommentVariableEntityDisplayTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
@@ -10,7 +10,7 @@
 /**
  * Tests comment variables migrated into an entity display.
  */
-class MigrateCommentVariableEntityDisplay extends MigrateCommentVariableDisplayBase {
+class MigrateCommentVariableEntityDisplayTest extends MigrateCommentVariableDisplayBase {
 
   /**
    * The migration to run.
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplay.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplayTest.php
similarity index 89%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplay.php
rename to core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplayTest.php
index c58d55b..adefa71 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplay.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplayTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateCommentVariableEntityFormDisplay.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateCommentVariableEntityFormDisplayTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
@@ -10,7 +10,7 @@
 /**
  * Tests comment variables migrated into an entity display.
  */
-class MigrateCommentVariableEntityFormDisplay extends MigrateCommentVariableDisplayBase {
+class MigrateCommentVariableEntityFormDisplayTest extends MigrateCommentVariableDisplayBase {
 
   /**
    * The migration to run.
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableField.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableFieldTest.php
similarity index 94%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableField.php
rename to core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableFieldTest.php
index c5c88c4..0bc5309 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableField.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateCommentVariableField.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateCommentVariableFieldTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
@@ -13,7 +13,7 @@
 /**
  * Tests comment variables migrated into a field entity.
  */
-class MigrateCommentVariableField extends MigrateDrupalTestBase {
+class MigrateCommentVariableFieldTest extends MigrateDrupalTestBase {
 
   static $modules = array('comment', 'node');
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstance.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstance.php
rename to core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php
index 60e9b57..f35fc45 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstance.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateCommentVariableInstance.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateCommentVariableInstanceTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
@@ -13,7 +13,7 @@
 /**
  * Tests comment variables migrated into a field instance.
  */
-class MigrateCommentVariableInstance extends MigrateDrupalTestBase {
+class MigrateCommentVariableInstanceTest extends MigrateDrupalTestBase {
 
   static $modules = array('comment', 'node');
 
diff --git a/core/modules/node/src/Tests/NodeFieldMultilingualTestCase.php b/core/modules/node/src/Tests/NodeFieldMultilingualTest.php
similarity index 97%
rename from core/modules/node/src/Tests/NodeFieldMultilingualTestCase.php
rename to core/modules/node/src/Tests/NodeFieldMultilingualTest.php
index 319fdb4..5139bb5 100644
--- a/core/modules/node/src/Tests/NodeFieldMultilingualTestCase.php
+++ b/core/modules/node/src/Tests/NodeFieldMultilingualTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeFieldMultilingualTestCase.
+ * Contains \Drupal\node\Tests\NodeFieldMultilingualTest.
  */
 
 namespace Drupal\node\Tests;
@@ -16,7 +16,7 @@
 /**
  * Functional test for multilingual fields.
  */
-class NodeFieldMultilingualTestCase extends WebTestBase {
+class NodeFieldMultilingualTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/node/src/Tests/NodeRevisionsAllTestCase.php b/core/modules/node/src/Tests/NodeRevisionsAllTest.php
similarity index 97%
rename from core/modules/node/src/Tests/NodeRevisionsAllTestCase.php
rename to core/modules/node/src/Tests/NodeRevisionsAllTest.php
index f82cd7d..df2556a 100644
--- a/core/modules/node/src/Tests/NodeRevisionsAllTestCase.php
+++ b/core/modules/node/src/Tests/NodeRevisionsAllTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeRevisionsAllTestCase.
+ * Contains \Drupal\node\Tests\NodeRevisionsAllTest.
  */
 
 namespace Drupal\node\Tests;
@@ -10,7 +10,7 @@
 /**
  * Tests actions against revisions for user with access to all revisions.
  */
-class NodeRevisionsAllTestCase extends NodeTestBase {
+class NodeRevisionsAllTest extends NodeTestBase {
   protected $nodes;
   protected $revisionLogs;
   protected $profile = "standard";
diff --git a/core/modules/node/src/Tests/Views/RevisionRelationships.php b/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php
similarity index 95%
rename from core/modules/node/src/Tests/Views/RevisionRelationships.php
rename to core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php
index 4968048..891a92c 100644
--- a/core/modules/node/src/Tests/Views/RevisionRelationships.php
+++ b/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Views\RevisionRelationships.
+ * Contains \Drupal\node\Tests\Views\RevisionRelationshipsTest.
  */
 namespace Drupal\node\Tests\Views;
 
@@ -13,7 +13,7 @@
 /**
  * Tests basic node_revision table integration into views.
  */
-class RevisionRelationships extends ViewTestBase {
+class RevisionRelationshipsTest extends ViewTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/system/src/Tests/Theme/ThemeTestPhpTemplate.php b/core/modules/system/src/Tests/Theme/EnginePhpTemplateTest.php
similarity index 89%
rename from core/modules/system/src/Tests/Theme/ThemeTestPhpTemplate.php
rename to core/modules/system/src/Tests/Theme/EnginePhpTemplateTest.php
index 35680fa..b48061c 100644
--- a/core/modules/system/src/Tests/Theme/ThemeTestPhpTemplate.php
+++ b/core/modules/system/src/Tests/Theme/EnginePhpTemplateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Theme\ThemeTestPhpTemplate.
+ * Contains \Drupal\system\Tests\Theme\EnginePhpTemplateTest.
  */
 
 namespace Drupal\system\Tests\Theme;
@@ -12,7 +12,7 @@
 /**
  * Tests theme functions and templates with the PHPTemplate engine.
  */
-class ThemeTestPhpTemplate extends WebTestBase {
+class EnginePhpTemplateTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/system/src/Tests/Theme/ThemeTestTwig.php b/core/modules/system/src/Tests/Theme/EngineTwigTest.php
similarity index 90%
rename from core/modules/system/src/Tests/Theme/ThemeTestTwig.php
rename to core/modules/system/src/Tests/Theme/EngineTwigTest.php
index 2dce51f..ea2a4b2 100644
--- a/core/modules/system/src/Tests/Theme/ThemeTestTwig.php
+++ b/core/modules/system/src/Tests/Theme/EngineTwigTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Theme\ThemeTestTwig.
+ * Contains \Drupal\system\Tests\Theme\EngineTwigTest.
  */
 
 namespace Drupal\system\Tests\Theme;
@@ -12,7 +12,7 @@
 /**
  * Tests theme functions with the Twig engine.
  */
-class ThemeTestTwig extends WebTestBase {
+class EngineTwigTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/system/src/Tests/Update/InvalidUpdateHook.php b/core/modules/system/src/Tests/Update/InvalidUpdateHookTest.php
similarity index 93%
rename from core/modules/system/src/Tests/Update/InvalidUpdateHook.php
rename to core/modules/system/src/Tests/Update/InvalidUpdateHookTest.php
index 460d03f..3beec5f 100644
--- a/core/modules/system/src/Tests/Update/InvalidUpdateHook.php
+++ b/core/modules/system/src/Tests/Update/InvalidUpdateHookTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Update\InvalidUpdateHook.
+ * Contains \Drupal\system\Tests\Update\InvalidUpdateHookTest.
  */
 
 namespace Drupal\system\Tests\Update;
@@ -13,7 +13,7 @@
 /**
  * Tests for missing update dependencies.
  */
-class InvalidUpdateHook extends WebTestBase {
+class InvalidUpdateHookTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/system/src/Tests/Update/UpdatesWith7x.php b/core/modules/system/src/Tests/Update/UpdatesWith7xTest.php
similarity index 94%
rename from core/modules/system/src/Tests/Update/UpdatesWith7x.php
rename to core/modules/system/src/Tests/Update/UpdatesWith7xTest.php
index 4d85f9d..537fd73 100644
--- a/core/modules/system/src/Tests/Update/UpdatesWith7x.php
+++ b/core/modules/system/src/Tests/Update/UpdatesWith7xTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Update\UpdatesWith7x.
+ * Contains \Drupal\system\Tests\Update\UpdatesWith7xTest.
  */
 
 namespace Drupal\system\Tests\Update;
@@ -12,7 +12,7 @@
 /**
  * Tests for missing update dependencies.
  */
-class UpdatesWith7x extends WebTestBase {
+class UpdatesWith7xTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNode.php b/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNodeTest.php
similarity index 93%
rename from core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNode.php
rename to core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNodeTest.php
index 1d754f0..493e25b 100644
--- a/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNode.php
+++ b/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNodeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Views\RelationshipRepresentativeNode.
+ * Contains \Drupal\taxonomy\Tests\Views\RelationshipRepresentativeNodeTest.
  */
 
 namespace Drupal\taxonomy\Tests\Views;
@@ -12,7 +12,7 @@
 /**
  * Tests the representative node relationship for terms.
  */
-class RelationshipRepresentativeNode extends TaxonomyTestBase {
+class RelationshipRepresentativeNodeTest extends TaxonomyTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/user/src/Tests/UserAccountLinksTests.php b/core/modules/user/src/Tests/UserAccountLinksTest.php
similarity index 97%
rename from core/modules/user/src/Tests/UserAccountLinksTests.php
rename to core/modules/user/src/Tests/UserAccountLinksTest.php
index ce936e4..c2aa8f7 100644
--- a/core/modules/user/src/Tests/UserAccountLinksTests.php
+++ b/core/modules/user/src/Tests/UserAccountLinksTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserAccountLinksTests.
+ * Contains \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/src/Tests/UserBlocksTests.php b/core/modules/user/src/Tests/UserBlocksTest.php
similarity index 97%
rename from core/modules/user/src/Tests/UserBlocksTests.php
rename to core/modules/user/src/Tests/UserBlocksTest.php
index 50127b4..42bf407 100644
--- a/core/modules/user/src/Tests/UserBlocksTests.php
+++ b/core/modules/user/src/Tests/UserBlocksTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserBlocksTests.
+ * Contains \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/user/src/Tests/Views/RelationshipRepresentativeNode.php b/core/modules/user/src/Tests/Views/RelationshipRepresentativeNodeTest.php
similarity index 93%
rename from core/modules/user/src/Tests/Views/RelationshipRepresentativeNode.php
rename to core/modules/user/src/Tests/Views/RelationshipRepresentativeNodeTest.php
index 886c1ff..abec488 100644
--- a/core/modules/user/src/Tests/Views/RelationshipRepresentativeNode.php
+++ b/core/modules/user/src/Tests/Views/RelationshipRepresentativeNodeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Views\RelationshipRepresentativeNode.
+ * Contains \Drupal\user\Tests\Views\RelationshipRepresentativeNodeTest.
  */
 
 namespace Drupal\user\Tests\Views;
@@ -12,7 +12,7 @@
 /**
  * Tests the representative node relationship for users.
  */
-class RelationshipRepresentativeNode extends UserTestBase {
+class RelationshipRepresentativeNodeTest extends UserTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views_ui/src/Tests/DisplayTestCRUD.php b/core/modules/views_ui/src/Tests/DisplayCRUDTest.php
similarity index 98%
rename from core/modules/views_ui/src/Tests/DisplayTestCRUD.php
rename to core/modules/views_ui/src/Tests/DisplayCRUDTest.php
index f8fb839..1f72c81 100644
--- a/core/modules/views_ui/src/Tests/DisplayTestCRUD.php
+++ b/core/modules/views_ui/src/Tests/DisplayCRUDTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\views_ui\Tests\DisplayTestCRUD.
+ * Contains \Drupal\views_ui\Tests\DisplayCRUDTest.
  */
 
 namespace Drupal\views_ui\Tests;
@@ -12,7 +12,7 @@
 /**
  * Tests the handling of displays in the UI, adding removing etc.
  */
-class DisplayTestCRUD extends UITestBase {
+class DisplayCRUDTest extends UITestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views_ui/src/Tests/DisplayPath.php b/core/modules/views_ui/src/Tests/DisplayPathTest.php
similarity index 97%
rename from core/modules/views_ui/src/Tests/DisplayPath.php
rename to core/modules/views_ui/src/Tests/DisplayPathTest.php
index 8eb3e6d..55f2a97 100644
--- a/core/modules/views_ui/src/Tests/DisplayPath.php
+++ b/core/modules/views_ui/src/Tests/DisplayPathTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\views_ui\Tests\DisplayPath
+ * Contains \Drupal\views_ui\Tests\DisplayPathTest.
  */
 
 namespace Drupal\views_ui\Tests;
@@ -12,7 +12,7 @@
  *
  * @see \Drupal\views\Plugin\views\display\PathPluginBase
  */
-class DisplayPath extends UITestBase {
+class DisplayPathTest extends UITestBase {
 
   /**
    * Views used by this test.
