diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointMediaQueryUnitTest.php
similarity index 96%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php
rename to core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointMediaQueryUnitTest.php
index d0ee5fb..1ed06ea 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointMediaQueryUnitTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\breakpoint\Tests\BreakpointMediaQueryTest.
+ * Definition of Drupal\breakpoint\Tests\BreakpointMediaQueryUnitTest.
  */
 
 namespace Drupal\breakpoint\Tests;
@@ -13,7 +13,7 @@
 /**
  * Tests for media queries in a breakpoint.
  */
-class BreakpointMediaQueryTest extends UnitTestBase {
+class BreakpointMediaQueryUnitTest extends UnitTestBase {
 
   public static function getInfo() {
     return array(
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/search/lib/Drupal/search/Tests/SearchExpressionInsertExtractTest.php b/core/modules/search/lib/Drupal/search/Tests/SearchExpressionInsertExtractUnitTest.php
similarity index 97%
rename from core/modules/search/lib/Drupal/search/Tests/SearchExpressionInsertExtractTest.php
rename to core/modules/search/lib/Drupal/search/Tests/SearchExpressionInsertExtractUnitTest.php
index b7ea84a..dc89596 100644
--- a/core/modules/search/lib/Drupal/search/Tests/SearchExpressionInsertExtractTest.php
+++ b/core/modules/search/lib/Drupal/search/Tests/SearchExpressionInsertExtractUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchExpressionInsertExtractTest.
+ * Definition of Drupal\search\Tests\SearchExpressionInsertExtractUnitTest.
  */
 
 namespace Drupal\search\Tests;
@@ -14,7 +14,7 @@
  *
  * @see http://drupal.org/node/419388 (issue)
  */
-class SearchExpressionInsertExtractTest extends UnitTestBase {
+class SearchExpressionInsertExtractUnitTest extends UnitTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Search expression insert/extract',
diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/NullBackendTest.php b/core/modules/system/lib/Drupal/system/Tests/Cache/NullBackendUnitTest.php
similarity index 86%
rename from core/modules/system/lib/Drupal/system/Tests/Cache/NullBackendTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Cache/NullBackendUnitTest.php
index 3882401..c6cae69 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Cache/NullBackendTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Cache/NullBackendUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Cache\NullBackendTest.
+ * Definition of Drupal\system\Tests\Cache\NullBackendUnitTest.
  */
 
 namespace Drupal\system\Tests\Cache;
@@ -13,7 +13,7 @@
 /**
  * Tests the cache NullBackend.
  */
-class NullBackendTest extends UnitTestBase {
+class NullBackendUnitTest extends UnitTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/ColorTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/ColorUnitTest.php
similarity index 97%
rename from core/modules/system/lib/Drupal/system/Tests/Common/ColorTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Common/ColorUnitTest.php
index 2c32b31..ae77695 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/ColorTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/ColorUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\ColorTest.
+ * Definition of Drupal\system\Tests\Common\ColorUnitTest.
  */
 
 namespace Drupal\system\Tests\Common;
@@ -13,7 +13,7 @@
 /**
  * Tests color conversion functions.
  */
-class ColorTest extends UnitTestBase {
+class ColorUnitTest extends UnitTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php b/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelUnitTest.php
similarity index 97%
rename from core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php
rename to core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelUnitTest.php
index f4dd294..59ac553 100644
--- a/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\DrupalKernel\DrupalKernelTest.
+ * Contains Drupal\system\Tests\DrupalKernel\DrupalKernelUnitTest.
  */
 
 namespace Drupal\system\Tests\DrupalKernel;
@@ -16,7 +16,7 @@
 /**
  * Tests compilation of the DIC.
  */
-class DrupalKernelTest extends UnitTestBase {
+class DrupalKernelUnitTest extends UnitTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableTest.php b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableUnitTest.php
similarity index 98%
rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableTest.php
rename to core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableUnitTest.php
index 9f4d01e..f3008e5 100644
--- a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\KeyValueStore\DatabaseStorageExpirableTest.
+ * Contains Drupal\system\Tests\KeyValueStore\DatabaseStorageExpirableUnitTest.
  */
 
 namespace Drupal\system\Tests\KeyValueStore;
@@ -12,7 +12,7 @@
 /**
  * Tests the key-value database storage.
  */
-class DatabaseStorageExpirableTest extends StorageTestBase {
+class DatabaseStorageExpirableUnitTest extends StorageUnitTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageUnitTest.php
similarity index 89%
rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php
rename to core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageUnitTest.php
index a76281a..1b9a061 100644
--- a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\KeyValueStore\DatabaseStorageTest.
+ * Contains Drupal\system\Tests\KeyValueStore\DatabaseStorageUnitTest.
  */
 
 namespace Drupal\system\Tests\KeyValueStore;
@@ -12,7 +12,7 @@
 /**
  * Tests the key-value database storage.
  */
-class DatabaseStorageTest extends StorageTestBase {
+class DatabaseStorageUnitTest extends StorageUnitTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionTest.php b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionUnitTest.php
similarity index 94%
rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionTest.php
rename to core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionUnitTest.php
index 6334382..3a1fd28 100644
--- a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\KeyValueStore\GarbageCollectionTest.
+ * Contains Drupal\system\Tests\KeyValueStore\GarbageCollectionUnitTest.
  */
 
 namespace Drupal\system\Tests\KeyValueStore;
@@ -14,7 +14,7 @@
 /**
  * Tests garbage collection for DatabaseStorageExpirable.
  */
-class GarbageCollectionTest extends UnitTestBase {
+class GarbageCollectionUnitTest extends UnitTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/MemoryStorageTest.php b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/MemoryStorageUnitTest.php
similarity index 89%
rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/MemoryStorageTest.php
rename to core/modules/system/lib/Drupal/system/Tests/KeyValueStore/MemoryStorageUnitTest.php
index 5f1f0ba..84efa72 100644
--- a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/MemoryStorageTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/MemoryStorageUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\KeyValueStore\MemoryStorageTest.
+ * Contains Drupal\system\Tests\KeyValueStore\MemoryStorageUnitTest.
  */
 
 namespace Drupal\system\Tests\KeyValueStore;
@@ -10,7 +10,7 @@
 /**
  * Tests the key-value memory storage.
  */
-class MemoryStorageTest extends StorageTestBase {
+class MemoryStorageUnitTest extends StorageUnitTestBase {
 
   /**
    * Holds the original default key/value service name.
diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageTestBase.php b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageUnitTestBase.php
similarity index 98%
rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageTestBase.php
rename to core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageUnitTestBase.php
index 9bd2412..9bae4d5 100644
--- a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageUnitTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\KeyValueStore\StorageTestBase.
+ * Contains Drupal\system\Tests\KeyValueStore\StorageUnitTestBase.
  */
 
 namespace Drupal\system\Tests\KeyValueStore;
@@ -14,7 +14,7 @@
 /**
  * Base class for testing key-value storages.
  */
-abstract class StorageTestBase extends UnitTestBase {
+abstract class StorageUnitTestBase extends UnitTestBase {
 
   /**
    * An array of random stdClass objects.
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/ChainMatcherTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/ChainMatcherUnitTest.php
similarity index 96%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/ChainMatcherTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Routing/ChainMatcherUnitTest.php
index c6b28cc..73f76aa 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/ChainMatcherTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/ChainMatcherUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\ChainMatcherTest.
+ * Definition of Drupal\system\Tests\Routing\ChainMatcherUnitTest.
  */
 
 namespace Drupal\system\Tests\Routing;
@@ -21,7 +21,7 @@
 /**
  * Basic tests for the ChainMatcher.
  */
-class ChainMatcherTest extends UnitTestBase {
+class ChainMatcherUnitTest extends UnitTestBase {
   
   public static function getInfo() {
     return array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/ControllerResolverTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/ControllerResolverUnitTest.php
similarity index 89%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/ControllerResolverTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Routing/ControllerResolverUnitTest.php
index 46ed2a3..46a9089 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/ControllerResolverTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/ControllerResolverUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\ControllerResolverTest.
+ * Definition of Drupal\system\Tests\Routing\ControllerResolverUnitTest.
  */
 
 namespace Drupal\system\Tests\Routing;
@@ -16,7 +16,7 @@
 /**
  * Tests that the Drupal-extended ControllerResolver is functioning properly.
  */
-class ControllerResolverTest extends UnitTestBase {
+class ControllerResolverUnitTest extends UnitTestBase {
 
   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/FirstEntryFinalMatcherUnitTest.php
similarity index 96%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/FirstEntryFinalMatcherTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Routing/FirstEntryFinalMatcherUnitTest.php
index a288b9e..5fd559a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/FirstEntryFinalMatcherTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/FirstEntryFinalMatcherUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\NestedMatcherTest.
+ * Definition of Drupal\system\Tests\Routing\FirstEntryFinalMatcherUnitTest.
  */
 
 namespace Drupal\system\Tests\Routing;
@@ -22,7 +22,7 @@
 /**
  * Basic tests for the NestedMatcher class.
  */
-class FirstEntryFinalMatcherTest extends UnitTestBase {
+class FirstEntryFinalMatcherUnitTest extends UnitTestBase {
 
   /**
    * A collection of shared fixture data for tests.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherUnitTest.php
similarity index 96%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherUnitTest.php
index c98da2e..06fa8ce 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\HttpMethodMMatcherTest.
+ * Definition of Drupal\system\Tests\Routing\HttpMethodMatcherUnitTest.
  */
 
 namespace Drupal\system\Tests\Routing;
@@ -22,7 +22,7 @@
 /**
  * Basic tests for the HttpMethodMatcher class.
  */
-class HttpMethodMatcherTest extends UnitTestBase {
+class HttpMethodMatcherUnitTest extends UnitTestBase {
 
   /**
    * A collection of shared fixture data for tests.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperUnitTest.php
similarity index 97%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperUnitTest.php
index 7f6f312..82fbe56 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\UrlMatcherDumperTest.
+ * Definition of Drupal\system\Tests\Routing\MatcherDumperUnitTest.
  */
 
 namespace Drupal\system\Tests\Routing;
@@ -17,7 +17,7 @@
 /**
  * Basic tests for the UrlMatcherDumper.
  */
-class MatcherDumperTest extends UnitTestBase {
+class MatcherDumperUnitTest extends UnitTestBase {
 
   /**
    * A collection of shared fixture data for tests.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/NestedMatcherTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/NestedMatcherUnitTest.php
similarity index 92%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/NestedMatcherTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Routing/NestedMatcherUnitTest.php
index 444785c..38912b3 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/NestedMatcherTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/NestedMatcherUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\NestedMatcherTest.
+ * Definition of Drupal\system\Tests\Routing\NestedMatcherUnitTest.
  */
 
 namespace Drupal\system\Tests\Routing;
@@ -22,7 +22,7 @@
 /**
  * Basic tests for the NestedMatcher class.
  */
-class NestedMatcherTest extends UnitTestBase {
+class NestedMatcherUnitTest extends UnitTestBase {
 
   /**
    * A collection of shared fixture data for tests.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherUnitTest.php
similarity index 98%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherUnitTest.php
index 0780250..d1011c7 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\PartialMatcherTest.
+ * Definition of Drupal\system\Tests\Routing\PathMatcherUnitTest.
  */
 
 namespace Drupal\system\Tests\Routing;
@@ -22,7 +22,7 @@
 /**
  * Basic tests for the UrlMatcherDumper.
  */
-class PathMatcherTest extends UnitTestBase {
+class PathMatcherUnitTest extends UnitTestBase {
 
   /**
    * A collection of shared fixture data for tests.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RouteTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/RouteUnitTest.php
similarity index 94%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/RouteTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Routing/RouteUnitTest.php
index 4fc7a11..a1f41a9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/RouteTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/RouteUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\RouteTest.
+ * Definition of Drupal\system\Tests\Routing\RouteUnitTest.
  */
 
 namespace Drupal\system\Tests\Routing;
@@ -15,7 +15,7 @@
 /**
  * Basic tests for the Route.
  */
-class RouteTest extends UnitTestBase {
+class RouteUnitTest extends UnitTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Routes',
diff --git a/core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php b/core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseUnitTest.php
similarity index 97%
rename from core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php
rename to core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseUnitTest.php
index 5fb54e3..a0302cf 100644
--- a/core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\TempStoreDatabaseTest.
+ * Definition of Drupal\user\Tests\TempStoreDatabaseUnitTest.
  */
 
 namespace Drupal\user\Tests;
@@ -17,7 +17,7 @@
  *
  * @see Drupal\Core\TempStore\TempStore.
  */
-class TempStoreDatabaseTest extends UnitTestBase {
+class TempStoreDatabaseUnitTest extends UnitTestBase {
 
   /**
    * A key/value store factory.
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/PluginTypeListTest.php b/core/modules/views/lib/Drupal/views/Tests/PluginTypeListUnitTest.php
similarity index 89%
rename from core/modules/views/lib/Drupal/views/Tests/PluginTypeListTest.php
rename to core/modules/views/lib/Drupal/views/Tests/PluginTypeListUnitTest.php
index 807ccb6..a50a6fb 100644
--- a/core/modules/views/lib/Drupal/views/Tests/PluginTypeListTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/PluginTypeListUnitTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\views\Tests\PluginTypeListTest.
+ * Definition of Drupal\views\Tests\PluginTypeListUnitTest.
  */
 
 namespace Drupal\views\Tests;
@@ -12,7 +12,7 @@
 /**
  * Class for plugin list testing.
  */
-class PluginTypeListTest extends UnitTestBase {
+class PluginTypeListUnitTest extends UnitTestBase {
 
   public static function getInfo() {
     return array(
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(