diff --git a/core/modules/block/tests/Drupal/block/Tests/BlockBaseTest.php b/core/modules/block/tests/Drupal/block/Tests/BlockBaseTest.php
index 085343eeb40e8c010f91a814c239e23719827b97..f0d04ec33caa67b832bb809a9666331e2eab8450 100644
--- a/core/modules/block/tests/Drupal/block/Tests/BlockBaseTest.php
+++ b/core/modules/block/tests/Drupal/block/Tests/BlockBaseTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\block\BlockBaseTest.
+ * Contains \Drupal\block\Tests\BlockBaseTest.
  */
 
-namespace Drupal\Tests\block;
+namespace Drupal\block\Tests;
 
 use Drupal\block_test\Plugin\Block\TestBlockInstantiation;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
diff --git a/core/modules/block/tests/Drupal/block/Tests/BlockFormControllerTest.php b/core/modules/block/tests/Drupal/block/Tests/BlockFormControllerTest.php
index 651dff627fde58b1870cf0eff0ad84daa5370b70..69b0a1bf1d44016bee6a79448282fcf09d6a4f26 100644
--- a/core/modules/block/tests/Drupal/block/Tests/BlockFormControllerTest.php
+++ b/core/modules/block/tests/Drupal/block/Tests/BlockFormControllerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\block\BlockFormControllerTest.
+ * Contains \Drupal\block\Tests\BlockFormControllerTest.
  */
 
-namespace Drupal\Tests\block;
+namespace Drupal\block\Tests;
 
 use Drupal\block\BlockFormController;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/taxonomy/tests/Drupal/taxonomy/Tests/Menu/TaxonomyLocalTasksTest.php b/core/modules/taxonomy/tests/Drupal/taxonomy/Tests/Menu/TaxonomyLocalTasksTest.php
index 52708a452a9ecce445dd595efefd38181a06cdb1..7a88a73aeafd640635a7e7b5a8a431e36f0a4f6b 100644
--- a/core/modules/taxonomy/tests/Drupal/taxonomy/Tests/Menu/TaxonomyLocalTasksTest.php
+++ b/core/modules/taxonomy/tests/Drupal/taxonomy/Tests/Menu/TaxonomyLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\TaxonomyLocalTasksTest.
+ * Contains \Drupal\taxonomy\Tests\Menu\TaxonomyLocalTasksTest.
  */
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\taxonomy\Tests\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 
diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/Core/Entity/UserTest.php b/core/modules/user/tests/Drupal/user/Tests/Plugin/Core/Entity/UserTest.php
index 597dbc0eedeb58c9ac679e24c65e3b822c957093..434c15ccacec23ca911315f0f6fbb3984b1bc5dd 100644
--- a/core/modules/user/tests/Drupal/user/Tests/Plugin/Core/Entity/UserTest.php
+++ b/core/modules/user/tests/Drupal/user/Tests/Plugin/Core/Entity/UserTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Entity\UserTest.
+ * Contains \Drupal\user\Tests\Plugin\Core\Entity\UserTest.
  */
 
-namespace Drupal\user\Tests\Entity;
+namespace Drupal\user\Tests\Plugin\Core\Entity;
 
 use Drupal\Tests\Core\Session\UserSessionTest;
 use Drupal\user\Entity\User;
diff --git a/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php b/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php
index 3a176d411efb2ca43b742f4a45bf6ba9d8ac80c8..60a284ca34d0658053626ec524aa54b203267109 100644
--- a/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\Core\NestedArrayTest.
+ * Contains \Drupal\Tests\Component\Utility\NestedArrayTest.
  */
 
-namespace Drupal\Tests\Core;
+namespace Drupal\Tests\Component\Utility;
 
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/tests/Drupal/Tests/Core/Batch/PercentagesTest.php b/core/tests/Drupal/Tests/Core/Batch/PercentagesTest.php
index 171b2ec6dc5b510ac9fb411388f2f0a0c51021ec..dd6f48f6c0e13a9640ec12bbda983fd9941b2a88 100644
--- a/core/tests/Drupal/Tests/Core/Batch/PercentagesTest.php
+++ b/core/tests/Drupal/Tests/Core/Batch/PercentagesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Batch\PercentagesTest.
+ * Contains \Drupal\Tests\Core\Batch\PercentagesTest.
  */
 
 namespace Drupal\Tests\Core\Batch;
@@ -18,7 +18,7 @@
  *
  * @see \Drupal\Component\Batch\Batch
  */
-class BatchTest extends UnitTestCase {
+class PercentagesTest extends UnitTestCase {
   protected $testCases = array();
 
   public static function getInfo() {
diff --git a/core/tests/Drupal/Tests/Core/Controller/ExceptionControllerTest.php b/core/tests/Drupal/Tests/Core/Controller/ExceptionControllerTest.php
index 020daab9866d6c9ddebc289280adac68ed4c52b3..98698dc587a86f97d6f61e590eff613ce68aac87 100644
--- a/core/tests/Drupal/Tests/Core/Controller/ExceptionControllerTest.php
+++ b/core/tests/Drupal/Tests/Core/Controller/ExceptionControllerTest.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\Tests\Core\Controller\ExceptionControllerTest
  */
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\Core\Controller;
 
 use Drupal\Core\ContentNegotiation;
 use Drupal\Core\Controller\ExceptionController;
diff --git a/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php b/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php
index 7de91e943961f2591ba69704b8ff11dc1d3924ff..f329135ab5530f082d692d41d8920f7b08e257fa 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\Tests\Core\Entity\Controller\EntityViewControllerTest.
  */
 
-namespace Drupal\Core\Tests\Entity\Controller;
+namespace Drupal\Tests\Core\Entity\Controller;
 
 use Drupal\Core\Entity\Controller\EntityViewController;
 use Drupal\Tests\UnitTestCase;