diff --git a/core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryUnitTest.php b/core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php
similarity index 96%
rename from core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryUnitTest.php
rename to core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php
index 6626af1..1e2524f 100644
--- a/core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryUnitTest.php
+++ b/core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\breakpoint\Tests\BreakpointMediaQueryUnitTest.
+ * Definition of Drupal\breakpoint\Tests\BreakpointMediaQueryTest.
  */
 
 namespace Drupal\breakpoint\Tests;
@@ -15,7 +15,7 @@
  *
  * @group Breakpoint
  */
-class BreakpointMediaQueryUnitTest extends UnitTestBase {
+class BreakpointMediaQueryTest extends UnitTestCase {
 
   public static function getInfo() {
     return array(
diff --git a/core/tests/Drupal/Tests/Core/Cache/NullBackendUnitTest.php b/core/tests/Drupal/Tests/Core/Cache/NullBackendTest.php
similarity index 81%
rename from core/tests/Drupal/Tests/Core/Cache/NullBackendUnitTest.php
rename to core/tests/Drupal/Tests/Core/Cache/NullBackendTest.php
index ed02960..22d4df3 100644
--- a/core/tests/Drupal/Tests/Core/Cache/NullBackendUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/NullBackendTest.php
@@ -2,8 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Cache\NullBackendUnitTest.
- * Contains \Drupal\Tests\Core\Cache\NullBackendTest.
+ * Definition of Drupal\Tests\Core\Cache\NullBackendTest.
  */
 
 namespace Drupal\Tests\Core\Cache;
@@ -16,7 +15,7 @@
  *
  * @group Cache
  */
-class NullBackendUnitTest extends UnitTestBase {
+class NullBackendTest extends UnitTestBase {
 
   public static function getInfo() {
     return array(