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/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/Routing/FirstEntryFinalMatcherUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/FirstEntryFinalMatcherUnitTest.php
index d87080d..5fd559a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/FirstEntryFinalMatcherUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/FirstEntryFinalMatcherUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\NestedMatcherUnitTest.
+ * Definition of Drupal\system\Tests\Routing\FirstEntryFinalMatcherUnitTest.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherUnitTest.php
index 03aabd1..06fa8ce 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/HttpMethodMatcherUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\HttpMethodMMatcherUnitTest.
+ * Definition of Drupal\system\Tests\Routing\HttpMethodMatcherUnitTest.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperUnitTest.php
index 416fb64..82fbe56 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\UrlMatcherDumperUnitTest.
+ * Definition of Drupal\system\Tests\Routing\MatcherDumperUnitTest.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherUnitTest.php
index 6896230..d1011c7 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/PathMatcherUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\PartialMatcherUnitTest.
+ * Definition of Drupal\system\Tests\Routing\PathMatcherUnitTest.
  */
 
 namespace Drupal\system\Tests\Routing;