diff --git a/core/modules/action/tests/src/Menu/ActionLocalTasksTest.php b/core/modules/action/tests/src/Menu/ActionLocalTasksTest.php
index 61844d2..c157173 100644
--- a/core/modules/action/tests/src/Menu/ActionLocalTasksTest.php
+++ b/core/modules/action/tests/src/Menu/ActionLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\action\Tests\Menu\ActionLocalTasksTest.
+ * Contains \Drupal\Tests\action\Menu\ActionLocalTasksTest.
  */
 
-namespace Drupal\action\Tests\Menu;
+namespace Drupal\Tests\action\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 
diff --git a/core/modules/aggregator/tests/src/Menu/AggregatorLocalTasksTest.php b/core/modules/aggregator/tests/src/Menu/AggregatorLocalTasksTest.php
index 63caa74..f85db35 100644
--- a/core/modules/aggregator/tests/src/Menu/AggregatorLocalTasksTest.php
+++ b/core/modules/aggregator/tests/src/Menu/AggregatorLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Tests\Menu\AggregatorLocalTasksTest.
+ * Contains \Drupal\Tests\aggregator\Menu\AggregatorLocalTasksTest.
  */
 
-namespace Drupal\aggregator\Tests\Menu;
+namespace Drupal\Tests\aggregator\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 
diff --git a/core/modules/aggregator/tests/src/Plugin/AggregatorPluginSettingsBaseTest.php b/core/modules/aggregator/tests/src/Plugin/AggregatorPluginSettingsBaseTest.php
index 0f65e3b..d3e66c4 100644
--- a/core/modules/aggregator/tests/src/Plugin/AggregatorPluginSettingsBaseTest.php
+++ b/core/modules/aggregator/tests/src/Plugin/AggregatorPluginSettingsBaseTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Tests\Plugin\AggregatorPluginSettingsBaseTest
+ * Contains \Drupal\Tests\aggregator\Plugin\AggregatorPluginSettingsBaseTest
  */
 
-namespace Drupal\aggregator\Tests\Plugin {
+namespace Drupal\Tests\aggregator\Plugin {
 
 use Drupal\aggregator\Form\SettingsForm;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/block/tests/src/BlockBaseTest.php b/core/modules/block/tests/src/BlockBaseTest.php
index 575a6fb..486be4b 100644
--- a/core/modules/block/tests/src/BlockBaseTest.php
+++ b/core/modules/block/tests/src/BlockBaseTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\block\Tests\BlockBaseTest.
+ * Contains \Drupal\Tests\block\BlockBaseTest.
  */
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block;
 
 use Drupal\block_test\Plugin\Block\TestBlockInstantiation;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
diff --git a/core/modules/block/tests/src/BlockConfigEntityUnitTest.php b/core/modules/block/tests/src/BlockConfigEntityUnitTest.php
index 76b9a30..fcffed0 100644
--- a/core/modules/block/tests/src/BlockConfigEntityUnitTest.php
+++ b/core/modules/block/tests/src/BlockConfigEntityUnitTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\block\Tests\BlockConfigEntityUnitTest.
+ * Contains \Drupal\Tests\block\BlockConfigEntityUnitTest.
  */
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\Core\Plugin\Fixtures\TestConfigurablePlugin;
diff --git a/core/modules/block/tests/src/BlockFormTest.php b/core/modules/block/tests/src/BlockFormTest.php
index 698baa2..9109da5 100644
--- a/core/modules/block/tests/src/BlockFormTest.php
+++ b/core/modules/block/tests/src/BlockFormTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\block\Tests\BlockFormTest.
+ * Contains \Drupal\Tests\block\BlockFormTest.
  */
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block;
 
 use Drupal\block\BlockForm;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/block/tests/src/CategoryAutocompleteTest.php b/core/modules/block/tests/src/CategoryAutocompleteTest.php
index 26bd6b9..fb6d5ce 100644
--- a/core/modules/block/tests/src/CategoryAutocompleteTest.php
+++ b/core/modules/block/tests/src/CategoryAutocompleteTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\block\Tests\CategoryAutocompleteTest.
+ * Contains \Drupal\Tests\block\CategoryAutocompleteTest.
  */
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block;
 
 use Drupal\block\Controller\CategoryAutocompleteController;
 use Drupal\Component\Utility\String;
diff --git a/core/modules/block/tests/src/Menu/BlockLocalTasksTest.php b/core/modules/block/tests/src/Menu/BlockLocalTasksTest.php
index bf7a3e4..05f53cd 100644
--- a/core/modules/block/tests/src/Menu/BlockLocalTasksTest.php
+++ b/core/modules/block/tests/src/Menu/BlockLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\block\Tests\Menu\BlockLocalTasksTest.
+ * Contains \Drupal\Tests\block\Menu\BlockLocalTasksTest.
  */
 
-namespace Drupal\block\Tests\Menu;
+namespace Drupal\Tests\block\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/core/modules/block/tests/src/Plugin/DisplayVariant/FullPageVariantTest.php b/core/modules/block/tests/src/Plugin/DisplayVariant/FullPageVariantTest.php
index 051b1b0..979da00 100644
--- a/core/modules/block/tests/src/Plugin/DisplayVariant/FullPageVariantTest.php
+++ b/core/modules/block/tests/src/Plugin/DisplayVariant/FullPageVariantTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\block\Tests\Plugin\DisplayVariant\FullPageVariantTest.
+ * Contains \Drupal\Tests\block\Plugin\DisplayVariant\FullPageVariantTest.
  */
 
-namespace Drupal\block\Tests\Plugin\DisplayVariant;
+namespace Drupal\Tests\block\Plugin\DisplayVariant;
 
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/modules/block/tests/src/Plugin/views/display/BlockTest.php b/core/modules/block/tests/src/Plugin/views/display/BlockTest.php
index 765cc57..3b7337b 100644
--- a/core/modules/block/tests/src/Plugin/views/display/BlockTest.php
+++ b/core/modules/block/tests/src/Plugin/views/display/BlockTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\block\Tests\Plugin\views\display\BlockTest.
+ * Contains \Drupal\Tests\block\Plugin\views\display\BlockTest.
  */
 
-namespace Drupal\block\Tests\Plugin\views\display;
+namespace Drupal\Tests\block\Plugin\views\display;
 
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/modules/block_content/tests/src/Menu/BlockContentLocalTasksTest.php b/core/modules/block_content/tests/src/Menu/BlockContentLocalTasksTest.php
index c989278..79d5e23 100644
--- a/core/modules/block_content/tests/src/Menu/BlockContentLocalTasksTest.php
+++ b/core/modules/block_content/tests/src/Menu/BlockContentLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\block_content\Tests\Menu\BlockContentLocalTasksTest.
+ * Contains \Drupal\Tests\block_content\Menu\BlockContentLocalTasksTest.
  */
 
-namespace Drupal\block_content\Tests\Menu;
+namespace Drupal\Tests\block_content\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/core/modules/book/tests/src/BookManagerTest.php b/core/modules/book/tests/src/BookManagerTest.php
index f7bd248..bfa1a7f 100644
--- a/core/modules/book/tests/src/BookManagerTest.php
+++ b/core/modules/book/tests/src/BookManagerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\book\Tests\BookManagerTest.
+ * Contains \Drupal\Tests\book\BookManagerTest.
  */
 
-namespace Drupal\book\Tests;
+namespace Drupal\Tests\book;
 
 use Drupal\book\BookManager;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/book/tests/src/Menu/BookLocalTasksTest.php b/core/modules/book/tests/src/Menu/BookLocalTasksTest.php
index 86492c4..47aaf32 100644
--- a/core/modules/book/tests/src/Menu/BookLocalTasksTest.php
+++ b/core/modules/book/tests/src/Menu/BookLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\book\Tests\Menu\BookLocalTasksTest.
+ * Contains \Drupal\Tests\book\Menu\BookLocalTasksTest.
  */
 
-namespace Drupal\book\Tests\Menu;
+namespace Drupal\Tests\book\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 
diff --git a/core/modules/breakpoint/tests/src/BreakpointConfigEntityUnitTest.php b/core/modules/breakpoint/tests/src/BreakpointConfigEntityUnitTest.php
index dc59e9c..95f1315 100644
--- a/core/modules/breakpoint/tests/src/BreakpointConfigEntityUnitTest.php
+++ b/core/modules/breakpoint/tests/src/BreakpointConfigEntityUnitTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\breakpoint\Tests\BreakpointConfigEntityUnitTest.
+ * Contains \Drupal\Tests\breakpoint\BreakpointConfigEntityUnitTest.
  */
 
-namespace Drupal\breakpoint\Tests;
+namespace Drupal\Tests\breakpoint;
 
 use Drupal\breakpoint\Entity\Breakpoint;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
diff --git a/core/modules/breakpoint/tests/src/BreakpointGroupConfigEntityUnitTest.php b/core/modules/breakpoint/tests/src/BreakpointGroupConfigEntityUnitTest.php
index 4b81a65..1b2647d 100644
--- a/core/modules/breakpoint/tests/src/BreakpointGroupConfigEntityUnitTest.php
+++ b/core/modules/breakpoint/tests/src/BreakpointGroupConfigEntityUnitTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\breakpoint\Tests\BreakpointGroupConfigEntityUnitTest.
+ * Contains \Drupal\Tests\breakpoint\BreakpointGroupConfigEntityUnitTest.
  */
 
-namespace Drupal\breakpoint\Tests;
+namespace Drupal\Tests\breakpoint;
 
 use Drupal\breakpoint\Entity\Breakpoint;
 use Drupal\breakpoint\Entity\BreakpointGroup;
diff --git a/core/modules/breakpoint/tests/src/BreakpointMediaQueryTest.php b/core/modules/breakpoint/tests/src/BreakpointMediaQueryTest.php
index 1186619..2d48a89 100644
--- a/core/modules/breakpoint/tests/src/BreakpointMediaQueryTest.php
+++ b/core/modules/breakpoint/tests/src/BreakpointMediaQueryTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Definition of Drupal\breakpoint\Tests\BreakpointMediaQueryTest.
+ * Definition of Drupal\Tests\breakpoint\BreakpointMediaQueryTest.
  */
 
-namespace Drupal\breakpoint\Tests;
+namespace Drupal\Tests\breakpoint;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\breakpoint\Entity\Breakpoint;
diff --git a/core/modules/comment/tests/src/CommentStatisticsUnitTest.php b/core/modules/comment/tests/src/CommentStatisticsUnitTest.php
index 3f994df..9a46501 100644
--- a/core/modules/comment/tests/src/CommentStatisticsUnitTest.php
+++ b/core/modules/comment/tests/src/CommentStatisticsUnitTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\CommentStatisticsTest.
+ * Contains \Drupal\Tests\comment\CommentStatisticsTest.
  */
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment;
 
 use Drupal\comment\CommentStatistics;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/comment/tests/src/Entity/CommentLockTest.php b/core/modules/comment/tests/src/Entity/CommentLockTest.php
index 887d3ca..2374ccd 100644
--- a/core/modules/comment/tests/src/Entity/CommentLockTest.php
+++ b/core/modules/comment/tests/src/Entity/CommentLockTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\comment\Tests\Entity\CommentTest
+ * Contains \Drupal\Tests\comment\Entity\CommentTest
  */
 
-namespace Drupal\comment\Tests\Entity;
+namespace Drupal\Tests\comment\Entity;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Entity\EntityType;
diff --git a/core/modules/config/tests/src/Menu/ConfigLocalTasksTest.php b/core/modules/config/tests/src/Menu/ConfigLocalTasksTest.php
index 627f61e..86318e4 100644
--- a/core/modules/config/tests/src/Menu/ConfigLocalTasksTest.php
+++ b/core/modules/config/tests/src/Menu/ConfigLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\config\Tests\Menu\ConfigLocalTasksTest.
+ * Contains \Drupal\Tests\config\Menu\ConfigLocalTasksTest.
  */
 
-namespace Drupal\config\Tests\Menu;
+namespace Drupal\Tests\config\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 
diff --git a/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php b/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php
index bdc04f8..0cfb161 100644
--- a/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php
+++ b/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\config_translation\Tests\ConfigEntityMapperTest.
+ * Contains \Drupal\Tests\config_translation\ConfigEntityMapperTest.
  */
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation;
 
 use Drupal\config_translation\ConfigEntityMapper;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/config_translation/tests/src/ConfigMapperManagerTest.php b/core/modules/config_translation/tests/src/ConfigMapperManagerTest.php
index 69be476..51d3fb9 100644
--- a/core/modules/config_translation/tests/src/ConfigMapperManagerTest.php
+++ b/core/modules/config_translation/tests/src/ConfigMapperManagerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\config_translation\Tests\ConfigMapperManagerTest.
+ * Contains \Drupal\Tests\config_translation\ConfigMapperManagerTest.
  */
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation;
 
 use Drupal\config_translation\ConfigMapperManager;
 use Drupal\Core\Language\Language;
diff --git a/core/modules/config_translation/tests/src/ConfigNamesMapperTest.php b/core/modules/config_translation/tests/src/ConfigNamesMapperTest.php
index 41a6b1a..7fc50e8 100644
--- a/core/modules/config_translation/tests/src/ConfigNamesMapperTest.php
+++ b/core/modules/config_translation/tests/src/ConfigNamesMapperTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\config_translation\Tests\ConfigNamesMapperTest.
+ * Contains \Drupal\Tests\config_translation\ConfigNamesMapperTest.
  */
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation;
 
 use Drupal\config_translation\ConfigNamesMapper;
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -34,7 +34,7 @@ class ConfigNamesMapperTest extends UnitTestCase {
    *
    * @see \Drupal\config_translation\ConfigNamesMapper
    *
-   * @var \Drupal\config_translation\Tests\TestConfigNamesMapper
+   * @var \Drupal\Tests\config_translation\TestConfigNamesMapper
    */
   protected $configNamesMapper;
 
diff --git a/core/modules/content_translation/tests/src/Menu/ContentTranslationLocalTasksTest.php b/core/modules/content_translation/tests/src/Menu/ContentTranslationLocalTasksTest.php
index 057a9a4..44f80b1 100644
--- a/core/modules/content_translation/tests/src/Menu/ContentTranslationLocalTasksTest.php
+++ b/core/modules/content_translation/tests/src/Menu/ContentTranslationLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\block\Tests\Menu\BlockLocalTasksTest.
+ * Contains \Drupal\Tests\block\Menu\BlockLocalTasksTest.
  */
 
-namespace Drupal\content_translation\Tests\Menu;
+namespace Drupal\Tests\content_translation\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 
diff --git a/core/modules/editor/tests/src/EditorConfigEntityUnitTest.php b/core/modules/editor/tests/src/EditorConfigEntityUnitTest.php
index 9064172..d3d00d1 100644
--- a/core/modules/editor/tests/src/EditorConfigEntityUnitTest.php
+++ b/core/modules/editor/tests/src/EditorConfigEntityUnitTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\editor\Tests\EditorConfigEntityUnitTest.
+ * Contains \Drupal\Tests\editor\EditorConfigEntityUnitTest.
  */
 
-namespace Drupal\editor\Tests;
+namespace Drupal\Tests\editor;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\editor\Entity\Editor;
diff --git a/core/modules/editor/tests/src/EditorXssFilter/StandardTest.php b/core/modules/editor/tests/src/EditorXssFilter/StandardTest.php
index 7927eef..d85065b 100644
--- a/core/modules/editor/tests/src/EditorXssFilter/StandardTest.php
+++ b/core/modules/editor/tests/src/EditorXssFilter/StandardTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\editor\Tests\EditorXssFilter\StandardTest.
+ * Contains \Drupal\Tests\editor\EditorXssFilter\StandardTest.
  */
 
-namespace Drupal\editor\Tests\EditorXssFilter;
+namespace Drupal\Tests\editor\EditorXssFilter;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\filter\Plugin\FilterInterface;
@@ -74,7 +74,7 @@ protected function setUp() {
    * Drupal\Component\Utility\Xss. See \Drupal\Tests\Component\Utility\XssTest::testBlacklistMode()
    * for more detailed test coverage.
    *
-   * @see \Drupal\editor\Tests\editor\EditorXssFilter\StandardTest::testFilterXss()
+   * @see \Drupal\Tests\editor\editor\EditorXssFilter\StandardTest::testFilterXss()
    * @see \Drupal\Tests\Component\Utility\XssTest::testBlacklistMode()
    */
   public function providerTestFilterXss() {
diff --git a/core/modules/field/tests/src/FieldConfigEntityUnitTest.php b/core/modules/field/tests/src/FieldConfigEntityUnitTest.php
index 0e1c723..12d3bb5 100644
--- a/core/modules/field/tests/src/FieldConfigEntityUnitTest.php
+++ b/core/modules/field/tests/src/FieldConfigEntityUnitTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\FieldConfigEntityUnitTest.
+ * Contains \Drupal\Tests\field\FieldConfigEntityUnitTest.
  */
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/field/tests/src/FieldInstanceConfigEntityUnitTest.php b/core/modules/field/tests/src/FieldInstanceConfigEntityUnitTest.php
index 1d2b2ca..6679aac 100644
--- a/core/modules/field/tests/src/FieldInstanceConfigEntityUnitTest.php
+++ b/core/modules/field/tests/src/FieldInstanceConfigEntityUnitTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\FieldInstanceConfigEntityUnitTest.
+ * Contains \Drupal\Tests\field\FieldInstanceConfigEntityUnitTest.
  */
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
diff --git a/core/modules/forum/tests/src/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php b/core/modules/forum/tests/src/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
index 33449a3..e656e9d 100644
--- a/core/modules/forum/tests/src/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
+++ b/core/modules/forum/tests/src/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\forum\Tests\Breadcrumb\ForumBreadcrumbBuilderBaseTest.
+ * Contains \Drupal\Tests\forum\Breadcrumb\ForumBreadcrumbBuilderBaseTest.
  */
 
-namespace Drupal\forum\Tests\Breadcrumb;
+namespace Drupal\Tests\forum\Breadcrumb;
 
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/modules/forum/tests/src/Breadcrumb/ForumListingBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
index 130545d..a27ca5b 100644
--- a/core/modules/forum/tests/src/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
+++ b/core/modules/forum/tests/src/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\forum\Tests\Breadcrumb\ForumListingBreadcrumbBuilderTest.
+ * Contains \Drupal\Tests\forum\Breadcrumb\ForumListingBreadcrumbBuilderTest.
  */
 
-namespace Drupal\forum\Tests\Breadcrumb;
+namespace Drupal\Tests\forum\Breadcrumb;
 
 use Drupal\Tests\UnitTestCase;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
diff --git a/core/modules/forum/tests/src/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
index b1726c4..a491d39 100644
--- a/core/modules/forum/tests/src/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
+++ b/core/modules/forum/tests/src/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\forum\Tests\Breadcrumb\ForumNodeBreadcrumbBuilderTest.
+ * Contains \Drupal\Tests\forum\Breadcrumb\ForumNodeBreadcrumbBuilderTest.
  */
 
-namespace Drupal\forum\Tests\Breadcrumb;
+namespace Drupal\Tests\forum\Breadcrumb;
 
 use Drupal\Tests\UnitTestCase;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
diff --git a/core/modules/forum/tests/src/ForumManagerTest.php b/core/modules/forum/tests/src/ForumManagerTest.php
index 0b0c7fa..82daceb 100644
--- a/core/modules/forum/tests/src/ForumManagerTest.php
+++ b/core/modules/forum/tests/src/ForumManagerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\forum\Tests\ForumManagerTest.
+ * Contains \Drupal\Tests\forum\ForumManagerTest.
  */
 
-namespace Drupal\forum\Tests;
+namespace Drupal\Tests\forum;
 
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/modules/hal/tests/src/FieldItemNormalizerDenormalizeExceptionsUnitTest.php b/core/modules/hal/tests/src/FieldItemNormalizerDenormalizeExceptionsUnitTest.php
index dc73cbd..85d54eb 100644
--- a/core/modules/hal/tests/src/FieldItemNormalizerDenormalizeExceptionsUnitTest.php
+++ b/core/modules/hal/tests/src/FieldItemNormalizerDenormalizeExceptionsUnitTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\hal\Tests\FieldItemNormalizerDenormalizeExceptionsUnitTest.
+ * Contains \Drupal\Tests\hal\FieldItemNormalizerDenormalizeExceptionsUnitTest.
  */
 
-namespace Drupal\hal\Tests;
+namespace Drupal\Tests\hal;
 
 use Drupal\hal\Normalizer\FieldItemNormalizer;
 
diff --git a/core/modules/hal/tests/src/FieldNormalizerDenormalizeExceptionsUnitTest.php b/core/modules/hal/tests/src/FieldNormalizerDenormalizeExceptionsUnitTest.php
index c39ffa0..d0847aa 100644
--- a/core/modules/hal/tests/src/FieldNormalizerDenormalizeExceptionsUnitTest.php
+++ b/core/modules/hal/tests/src/FieldNormalizerDenormalizeExceptionsUnitTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\hal\Tests\FieldNormalizerDenormalizeExceptionsUnitTest.
+ * Contains \Drupal\Tests\hal\FieldNormalizerDenormalizeExceptionsUnitTest.
  */
 
-namespace Drupal\hal\Tests;
+namespace Drupal\Tests\hal;
 
 use Drupal\hal\Normalizer\FieldNormalizer;
 
diff --git a/core/modules/hal/tests/src/NormalizerDenormalizeExceptionsUnitTestBase.php b/core/modules/hal/tests/src/NormalizerDenormalizeExceptionsUnitTestBase.php
index f16b223..736a77e 100644
--- a/core/modules/hal/tests/src/NormalizerDenormalizeExceptionsUnitTestBase.php
+++ b/core/modules/hal/tests/src/NormalizerDenormalizeExceptionsUnitTestBase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\hal\Tests\NormalizerDenormalizeExceptionsUnitTestBase.
+ * Contains \Drupal\Tests\hal\NormalizerDenormalizeExceptionsUnitTestBase.
  */
 
-namespace Drupal\hal\Tests;
+namespace Drupal\Tests\hal;
 
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/modules/language/tests/src/LanguageNegotiationUrlTest.php b/core/modules/language/tests/src/LanguageNegotiationUrlTest.php
index 6a4df28..0ddfc34 100644
--- a/core/modules/language/tests/src/LanguageNegotiationUrlTest.php
+++ b/core/modules/language/tests/src/LanguageNegotiationUrlTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\language\Tests\LanguageNegotiationUrlTest.
+ * Contains \Drupal\Tests\language\LanguageNegotiationUrlTest.
  */
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language;
 
 use Drupal\Core\Session\UserSession;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/language/tests/src/Menu/LanguageLocalTasks.php b/core/modules/language/tests/src/Menu/LanguageLocalTasks.php
index 8ec2313..b77043a 100644
--- a/core/modules/language/tests/src/Menu/LanguageLocalTasks.php
+++ b/core/modules/language/tests/src/Menu/LanguageLocalTasks.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\language\Tests\Menu\LanguageLocalTasks.
+ * Contains \Drupal\Tests\language\Menu\LanguageLocalTasks.
  */
 
-namespace Drupal\language\Tests\Menu;
+namespace Drupal\Tests\language\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 
diff --git a/core/modules/locale/tests/src/LocaleLookupTest.php b/core/modules/locale/tests/src/LocaleLookupTest.php
index a62e40d..e624637 100644
--- a/core/modules/locale/tests/src/LocaleLookupTest.php
+++ b/core/modules/locale/tests/src/LocaleLookupTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\locale\Tests\LocaleLookupTest.
+ * Contains \Drupal\Tests\locale\LocaleLookupTest.
  */
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\locale\LocaleLookup;
diff --git a/core/modules/locale/tests/src/LocaleTranslationTest.php b/core/modules/locale/tests/src/LocaleTranslationTest.php
index 34c24a8..f662b5a 100644
--- a/core/modules/locale/tests/src/LocaleTranslationTest.php
+++ b/core/modules/locale/tests/src/LocaleTranslationTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\locale\Tests\LocaleTranslationTest.
+ * Contains \Drupal\Tests\locale\LocaleTranslationTest.
  */
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale;
 
 use Drupal\locale\LocaleTranslation;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/locale/tests/src/Menu/LocaleLocalTasksTest.php b/core/modules/locale/tests/src/Menu/LocaleLocalTasksTest.php
index 16edc7e..141ca6e 100644
--- a/core/modules/locale/tests/src/Menu/LocaleLocalTasksTest.php
+++ b/core/modules/locale/tests/src/Menu/LocaleLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\locale\Tests\Menu\LocaleLocalTasksTest.
+ * Contains \Drupal\Tests\locale\Menu\LocaleLocalTasksTest.
  */
 
-namespace Drupal\locale\Tests\Menu;
+namespace Drupal\Tests\locale\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 
diff --git a/core/modules/menu_link/tests/src/MenuTreeTest.php b/core/modules/menu_link/tests/src/MenuTreeTest.php
index bd77a45..e221514 100644
--- a/core/modules/menu_link/tests/src/MenuTreeTest.php
+++ b/core/modules/menu_link/tests/src/MenuTreeTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\menu_link\Tests\MenuTreeTest.
+ * Contains \Drupal\Tests\menu_link\MenuTreeTest.
  */
 
-namespace Drupal\menu_link\Tests {
+namespace Drupal\Tests\menu_link {
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\EntityStorageInterface;
@@ -33,7 +33,7 @@ class MenuTreeTest extends UnitTestCase {
   /**
    * The tested menu tree.
    *
-   * @var \Drupal\menu_link\MenuTree|\Drupal\menu_link\Tests\TestMenuTree
+   * @var \Drupal\menu_link\MenuTree|\Drupal\Tests\menu_link\TestMenuTree
    */
   protected $menuTree;
 
diff --git a/core/modules/migrate/tests/src/MigrateExecutableTest.php b/core/modules/migrate/tests/src/MigrateExecutableTest.php
index fd0da23..ad0d8b7 100644
--- a/core/modules/migrate/tests/src/MigrateExecutableTest.php
+++ b/core/modules/migrate/tests/src/MigrateExecutableTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateExecutableTest.
+ * Contains \Drupal\Tests\migrate\MigrateExecutableTest.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate;
 
 use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
@@ -18,7 +18,7 @@
  * @group Drupal
  * @group migrate
  *
- * @covers \Drupal\migrate\Tests\MigrateExecutableTest
+ * @covers \Drupal\Tests\migrate\MigrateExecutableTest
  */
 class MigrateExecutableTest extends MigrateTestCase {
 
@@ -39,7 +39,7 @@ class MigrateExecutableTest extends MigrateTestCase {
   /**
    * The tested migrate executable.
    *
-   * @var \Drupal\migrate\Tests\TestMigrateExecutable
+   * @var \Drupal\Tests\migrate\TestMigrateExecutable
    */
   protected $executable;
 
diff --git a/core/modules/migrate/tests/src/MigrateExecuteableMemoryExceededTest.php b/core/modules/migrate/tests/src/MigrateExecuteableMemoryExceededTest.php
index e4b6e24..de09fa2 100644
--- a/core/modules/migrate/tests/src/MigrateExecuteableMemoryExceededTest.php
+++ b/core/modules/migrate/tests/src/MigrateExecuteableMemoryExceededTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateExecuteableMemoryExceeded.
+ * Contains \Drupal\Tests\migrate\MigrateExecuteableMemoryExceeded.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate;
 
 /**
  * Tests the \Drupal\migrate\MigrateExecutable::memoryExceeded() method.
@@ -32,7 +32,7 @@ class MigrateExecuteableMemoryExceededTest extends MigrateTestCase {
   /**
    * The tested migrate executable.
    *
-   * @var \Drupal\migrate\Tests\TestMigrateExecutable
+   * @var \Drupal\Tests\migrate\TestMigrateExecutable
    */
   protected $executable;
 
diff --git a/core/modules/migrate/tests/src/MigrateSqlIdMapEnsureTablesTest.php b/core/modules/migrate/tests/src/MigrateSqlIdMapEnsureTablesTest.php
index 6727aab..a2b1fc2 100644
--- a/core/modules/migrate/tests/src/MigrateSqlIdMapEnsureTablesTest.php
+++ b/core/modules/migrate/tests/src/MigrateSqlIdMapEnsureTablesTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateSqlIdMapEnsureTablesTest.
+ * Contains \Drupal\Tests\migrate\MigrateSqlIdMapEnsureTablesTest.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate;
 
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 
diff --git a/core/modules/migrate/tests/src/MigrateSqlIdMapTest.php b/core/modules/migrate/tests/src/MigrateSqlIdMapTest.php
index 577006f..9465eef 100644
--- a/core/modules/migrate/tests/src/MigrateSqlIdMapTest.php
+++ b/core/modules/migrate/tests/src/MigrateSqlIdMapTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateSqlIdMapTestCase.
+ * Contains \Drupal\Tests\migrate\MigrateSqlIdMapTestCase.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate;
 
 use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\MigrateException;
@@ -66,7 +66,7 @@ public static function getInfo() {
    * @param string $prefix
    *   (optional) The database prefix.
    *
-   * @return \Drupal\migrate\Tests\TestSqlIdMap
+   * @return \Drupal\Tests\migrate\TestSqlIdMap
    *   A SQL ID map plugin test instance.
    */
   protected function getIdMap($database_contents = array(), $connection_options = array(), $prefix = '') {
diff --git a/core/modules/migrate/tests/src/MigrateSqlSourceTestCase.php b/core/modules/migrate/tests/src/MigrateSqlSourceTestCase.php
index a456815..ff91cad 100644
--- a/core/modules/migrate/tests/src/MigrateSqlSourceTestCase.php
+++ b/core/modules/migrate/tests/src/MigrateSqlSourceTestCase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateSqlSourceTestCase.
+ * Contains \Drupal\Tests\migrate\MigrateSqlSourceTestCase.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate;
 
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\migrate\Source;
@@ -79,7 +79,7 @@ protected function setUp() {
       ->method('getHighwater')
       ->will($this->returnValue(static::ORIGINAL_HIGHWATER));
     // Need the test class, not the original because we need a setDatabase method. This is not pretty :/
-    $plugin_class  = preg_replace('/^(Drupal\\\\\w+\\\\)Plugin\\\\migrate(\\\\source(\\\\.+)?\\\\)([^\\\\]+)$/', '\1Tests\2Test\4', static::PLUGIN_CLASS);
+    $plugin_class  = preg_replace('/^Drupal\\\\(\w+)\\\\Plugin\\\\migrate(\\\\source(\\\\.+)?\\\\)([^\\\\]+)$/', 'Drupal\\Tests\\\$1$2Test$4', static::PLUGIN_CLASS);
     $plugin = new $plugin_class($this->migrationConfiguration['source'], $this->migrationConfiguration['source']['plugin'], array(), $migration);
     $plugin->setDatabase($this->getDatabase($this->databaseContents + array('test_map' => array())));
     $plugin->setModuleHandler($module_handler);
diff --git a/core/modules/migrate/tests/src/MigrateTestCase.php b/core/modules/migrate/tests/src/MigrateTestCase.php
index 279ffa9..04e5c4d 100644
--- a/core/modules/migrate/tests/src/MigrateTestCase.php
+++ b/core/modules/migrate/tests/src/MigrateTestCase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateTestCase.
+ * Contains \Drupal\Tests\migrate\MigrateTestCase.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Database\Driver\fake\FakeConnection;
diff --git a/core/modules/migrate/tests/src/RowTest.php b/core/modules/migrate/tests/src/RowTest.php
index c30375c..900aabb 100644
--- a/core/modules/migrate/tests/src/RowTest.php
+++ b/core/modules/migrate/tests/src/RowTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\RowTest.
+ * Contains \Drupal\Tests\migrate\RowTest.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate;
 
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate/tests/src/TestMigrateExecutable.php b/core/modules/migrate/tests/src/TestMigrateExecutable.php
index 8746236..2855063 100644
--- a/core/modules/migrate/tests/src/TestMigrateExecutable.php
+++ b/core/modules/migrate/tests/src/TestMigrateExecutable.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\TestMigrateExecutable.
+ * Contains \Drupal\Tests\migrate\TestMigrateExecutable.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate;
 
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\migrate\MigrateExecutable;
diff --git a/core/modules/migrate/tests/src/TestSqlIdMap.php b/core/modules/migrate/tests/src/TestSqlIdMap.php
index cad8b3b..a9b83b9 100644
--- a/core/modules/migrate/tests/src/TestSqlIdMap.php
+++ b/core/modules/migrate/tests/src/TestSqlIdMap.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\TestSqlIdMap.
+ * Contains \Drupal\Tests\migrate\TestSqlIdMap.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate;
 
 use Drupal\Component\Utility\String;
 use Drupal\Core\Database\Connection;
diff --git a/core/modules/migrate/tests/src/destination/PerComponentEntityDisplayTest.php b/core/modules/migrate/tests/src/destination/PerComponentEntityDisplayTest.php
index d36acb4..4c527c9 100644
--- a/core/modules/migrate/tests/src/destination/PerComponentEntityDisplayTest.php
+++ b/core/modules/migrate/tests/src/destination/PerComponentEntityDisplayTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\destination\EntityDisplayTest.
+ * Contains \Drupal\Tests\migrate\destination\EntityDisplayTest.
  */
 
-namespace Drupal\migrate\Tests\destination;
+namespace Drupal\Tests\migrate\destination;
 
 use Drupal\migrate\Plugin\migrate\destination\ComponentEntityDisplayBase;
 use Drupal\migrate\Row;
-use Drupal\migrate\Tests\MigrateTestCase;
+use Drupal\Tests\migrate\MigrateTestCase;
 
 /**
  * Tests the entity display destination plugin.
diff --git a/core/modules/migrate/tests/src/destination/PerComponentEntityFormDisplayTest.php b/core/modules/migrate/tests/src/destination/PerComponentEntityFormDisplayTest.php
index 8d24988..1722527 100644
--- a/core/modules/migrate/tests/src/destination/PerComponentEntityFormDisplayTest.php
+++ b/core/modules/migrate/tests/src/destination/PerComponentEntityFormDisplayTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\destination\EntityFormDisplayTest.
+ * Contains \Drupal\Tests\migrate\destination\EntityFormDisplayTest.
  */
 
-namespace Drupal\migrate\Tests\destination;
+namespace Drupal\Tests\migrate\destination;
 
 use Drupal\migrate\Plugin\migrate\destination\PerComponentEntityFormDisplay;
 use Drupal\migrate\Row;
-use Drupal\migrate\Tests\MigrateTestCase;
+use Drupal\Tests\migrate\MigrateTestCase;
 
 /**
  * Tests the entity display destination plugin.
diff --git a/core/modules/migrate/tests/src/process/CallbackTest.php b/core/modules/migrate/tests/src/process/CallbackTest.php
index 1a29ab9..c2d35c9 100644
--- a/core/modules/migrate/tests/src/process/CallbackTest.php
+++ b/core/modules/migrate/tests/src/process/CallbackTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\process\CallbackTest.
+ * Contains \Drupal\Tests\migrate\process\CallbackTest.
  */
 
-namespace Drupal\migrate\Tests\process;
+namespace Drupal\Tests\migrate\process;
 
 use Drupal\migrate\Plugin\migrate\process\Callback;
 
diff --git a/core/modules/migrate/tests/src/process/ConcatTest.php b/core/modules/migrate/tests/src/process/ConcatTest.php
index a189fe1..8942d59 100644
--- a/core/modules/migrate/tests/src/process/ConcatTest.php
+++ b/core/modules/migrate/tests/src/process/ConcatTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\process\ConcatTest.
+ * Contains \Drupal\Tests\migrate\process\ConcatTest.
  */
 
-namespace Drupal\migrate\Tests\process;
+namespace Drupal\Tests\migrate\process;
 
 use Drupal\migrate\Plugin\migrate\process\Concat;
 
diff --git a/core/modules/migrate/tests/src/process/DedupeEntityTest.php b/core/modules/migrate/tests/src/process/DedupeEntityTest.php
index 6f9512d..adebca6 100644
--- a/core/modules/migrate/tests/src/process/DedupeEntityTest.php
+++ b/core/modules/migrate/tests/src/process/DedupeEntityTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\migrate\Tests\process\DedupeEntityTest.
+ * Contains \Drupal\Tests\migrate\process\DedupeEntityTest.
  */
 
-namespace Drupal\migrate\Tests\process;
+namespace Drupal\Tests\migrate\process;
 
 use Drupal\migrate\Plugin\migrate\process\DedupeEntity;
 use Drupal\Component\Utility\Unicode;
diff --git a/core/modules/migrate/tests/src/process/ExtractTest.php b/core/modules/migrate/tests/src/process/ExtractTest.php
index 5266abf..136f0bf 100644
--- a/core/modules/migrate/tests/src/process/ExtractTest.php
+++ b/core/modules/migrate/tests/src/process/ExtractTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\migrate\Tests\process\ExtractTest.
+ * Contains \Drupal\Tests\migrate\process\ExtractTest.
  */
 
-namespace Drupal\migrate\Tests\process;
+namespace Drupal\Tests\migrate\process;
 
 use Drupal\migrate\Plugin\migrate\process\Extract;
 
diff --git a/core/modules/migrate/tests/src/process/FlattenTest.php b/core/modules/migrate/tests/src/process/FlattenTest.php
index d1f8c35..e63b52c 100644
--- a/core/modules/migrate/tests/src/process/FlattenTest.php
+++ b/core/modules/migrate/tests/src/process/FlattenTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\migrate\Tests\process\FlattenTest.
+ * Contains \Drupal\Tests\migrate\process\FlattenTest.
  */
 
-namespace Drupal\migrate\Tests\process;
+namespace Drupal\Tests\migrate\process;
 use Drupal\migrate\Plugin\migrate\process\Flatten;
 
 
diff --git a/core/modules/migrate/tests/src/process/GetTest.php b/core/modules/migrate/tests/src/process/GetTest.php
index daedc08..0ae6bf2 100644
--- a/core/modules/migrate/tests/src/process/GetTest.php
+++ b/core/modules/migrate/tests/src/process/GetTest.php
@@ -4,7 +4,7 @@
  * Contains
  */
 
-namespace Drupal\migrate\Tests\process;
+namespace Drupal\Tests\migrate\process;
 
 use Drupal\migrate\Plugin\migrate\process\TestGet;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate/tests/src/process/IteratorTest.php b/core/modules/migrate/tests/src/process/IteratorTest.php
index 9ca2f62..6d962dc 100644
--- a/core/modules/migrate/tests/src/process/IteratorTest.php
+++ b/core/modules/migrate/tests/src/process/IteratorTest.php
@@ -1,17 +1,17 @@
 <?php
 /**
  * @file
- * Contains Drupal\migrate\Tests\process\IteratorTest.
+ * Contains Drupal\Tests\migrate\process\IteratorTest.
  */
 
-namespace Drupal\migrate\Tests\process;
+namespace Drupal\Tests\migrate\process;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\Plugin\migrate\process\Get;
 use Drupal\migrate\Plugin\migrate\process\Iterator;
 use Drupal\migrate\Plugin\migrate\process\StaticMap;
 use Drupal\migrate\Row;
-use Drupal\migrate\Tests\MigrateTestCase;
+use Drupal\Tests\migrate\MigrateTestCase;
 
 /**
  * Tests the iterator process plugin.
diff --git a/core/modules/migrate/tests/src/process/MachineNameTest.php b/core/modules/migrate/tests/src/process/MachineNameTest.php
index c1c41c6..5c45f57 100644
--- a/core/modules/migrate/tests/src/process/MachineNameTest.php
+++ b/core/modules/migrate/tests/src/process/MachineNameTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\migrate\Tests\process\MachineNameTest.
+ * Contains \Drupal\Tests\migrate\process\MachineNameTest.
  */
 
-namespace Drupal\migrate\Tests\process;
+namespace Drupal\Tests\migrate\process;
 
 use Drupal\migrate\Plugin\migrate\process\TestMachineName;
 
diff --git a/core/modules/migrate/tests/src/process/MigrateProcessTestCase.php b/core/modules/migrate/tests/src/process/MigrateProcessTestCase.php
index 4b45f35..e7b7ad5 100644
--- a/core/modules/migrate/tests/src/process/MigrateProcessTestCase.php
+++ b/core/modules/migrate/tests/src/process/MigrateProcessTestCase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\process\MigrateProcessTestCase.
+ * Contains \Drupal\Tests\migrate\process\MigrateProcessTestCase.
  */
 
-namespace Drupal\migrate\Tests\process;
+namespace Drupal\Tests\migrate\process;
 
-use Drupal\migrate\Tests\MigrateTestCase;
+use Drupal\Tests\migrate\MigrateTestCase;
 
 abstract class MigrateProcessTestCase extends MigrateTestCase {
 
diff --git a/core/modules/migrate/tests/src/process/StaticMapTest.php b/core/modules/migrate/tests/src/process/StaticMapTest.php
index 9044526..f3b1c10 100644
--- a/core/modules/migrate/tests/src/process/StaticMapTest.php
+++ b/core/modules/migrate/tests/src/process/StaticMapTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\migrate\Tests\process\StaticMapTest.
+ * Contains \Drupal\Tests\migrate\process\StaticMapTest.
  */
 
-namespace Drupal\migrate\Tests\process;
+namespace Drupal\Tests\migrate\process;
 
 use Drupal\migrate\Plugin\migrate\process\StaticMap;
 
diff --git a/core/modules/migrate_drupal/tests/src/source/VariableMultiRowSourceWithHighwaterTest.php b/core/modules/migrate_drupal/tests/src/source/VariableMultiRowSourceWithHighwaterTest.php
index 55341dc..7503c16 100644
--- a/core/modules/migrate_drupal/tests/src/source/VariableMultiRowSourceWithHighwaterTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/VariableMultiRowSourceWithHighwaterTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\VariableMultiRowSourceWithHighwaterTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\VariableMultiRowSourceWithHighwaterTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source;
+namespace Drupal\Tests\migrate_drupal\source;
 
 /**
  * Tests variable multirow source w/ highwater handling.
diff --git a/core/modules/migrate_drupal/tests/src/source/VariableMultiRowTest.php b/core/modules/migrate_drupal/tests/src/source/VariableMultiRowTest.php
index 5941b18..1df6540 100644
--- a/core/modules/migrate_drupal/tests/src/source/VariableMultiRowTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/VariableMultiRowTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\VariableMultiRowTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\VariableMultiRowTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source;
+namespace Drupal\Tests\migrate_drupal\source;
 
 /**
  * Tests the Drupal 6 variable multirow source.
diff --git a/core/modules/migrate_drupal/tests/src/source/VariableMultiRowTestBase.php b/core/modules/migrate_drupal/tests/src/source/VariableMultiRowTestBase.php
index ace536d..a96024f 100644
--- a/core/modules/migrate_drupal/tests/src/source/VariableMultiRowTestBase.php
+++ b/core/modules/migrate_drupal/tests/src/source/VariableMultiRowTestBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\VariableMultiRowTestBase.
+ * Contains \Drupal\Tests\migrate_drupal\source\VariableMultiRowTestBase.
  */
 
-namespace Drupal\migrate_drupal\Tests\source;
+namespace Drupal\Tests\migrate_drupal\source;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Base class for variable multirow source unit tests.
@@ -45,7 +45,7 @@
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source;
+namespace Drupal\Tests\migrate_drupal\source;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/VariableTest.php b/core/modules/migrate_drupal/tests/src/source/VariableTest.php
index 9b1f0b7..208e681 100644
--- a/core/modules/migrate_drupal/tests/src/source/VariableTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/VariableTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\VariableTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\VariableTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source;
+namespace Drupal\Tests\migrate_drupal\source;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the variable source plugin.
@@ -59,7 +59,7 @@ public static function getInfo() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source;
+namespace Drupal\Tests\migrate_drupal\source;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/ActionTest.php b/core/modules/migrate_drupal/tests/src/source/d6/ActionTest.php
index d6dd2ea..c09a4f3 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/ActionTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/ActionTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\ActionTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\ActionTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests Drupal action migration source.
@@ -86,7 +86,7 @@ protected function setUp() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/AggregatorFeedTest.php b/core/modules/migrate_drupal/tests/src/source/d6/AggregatorFeedTest.php
index 9184dea..67c6a4c 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/AggregatorFeedTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/AggregatorFeedTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\AggregatorFeedTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\AggregatorFeedTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 aggregator feed source.
@@ -79,7 +79,7 @@ protected function setUp() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/AggregatorItemTest.php b/core/modules/migrate_drupal/tests/src/source/d6/AggregatorItemTest.php
index cfa88cc..ceba23c 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/AggregatorItemTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/AggregatorItemTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\AggregatorItemTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\AggregatorItemTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 aggregator item source.
@@ -68,7 +68,7 @@ public static function getInfo() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/BlockTest.php b/core/modules/migrate_drupal/tests/src/source/d6/BlockTest.php
index 2a02af9..acedac5 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/BlockTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/BlockTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\BlockTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\BlockTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 block source.
@@ -103,7 +103,7 @@ public function testRetrieval() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/BoxTest.php b/core/modules/migrate_drupal/tests/src/source/d6/BoxTest.php
index d43cf5d..8a0e001 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/BoxTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/BoxTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\BoxesTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\BoxesTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 box source.
@@ -70,7 +70,7 @@ public static function getInfo() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/CommentSourceWithHighwaterTest.php b/core/modules/migrate_drupal/tests/src/source/d6/CommentSourceWithHighwaterTest.php
index 1e4c4dd..2d24498 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/CommentSourceWithHighwaterTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/CommentSourceWithHighwaterTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\CommentSourceTestWithHighwater.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\CommentSourceTestWithHighwater.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 /**
  * Tests the Drupal 6 comment source w/ highwater handling.
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/CommentTest.php b/core/modules/migrate_drupal/tests/src/source/d6/CommentTest.php
index 519e681..b193cd2 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/CommentTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/CommentTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\CommentTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\CommentTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 /**
  * Tests the Drupal 6 comment source.
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/CommentTestBase.php b/core/modules/migrate_drupal/tests/src/source/d6/CommentTestBase.php
index 070a060..097f9b2 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/CommentTestBase.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/CommentTestBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\CommentTestBase.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\CommentTestBase.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Base class for comment source unit tests.
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/ContactCategoryTest.php b/core/modules/migrate_drupal/tests/src/source/d6/ContactCategoryTest.php
index 7da67f7..b057787 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/ContactCategoryTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/ContactCategoryTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\ContactCategoryTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\ContactCategoryTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 contact category source.
@@ -70,7 +70,7 @@ protected function setUp() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/Drupal6SqlBaseTest.php b/core/modules/migrate_drupal/tests/src/source/d6/Drupal6SqlBaseTest.php
index 5cb192e..671440c 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/Drupal6SqlBaseTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/Drupal6SqlBaseTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\Drupal6SqlBaseTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\Drupal6SqlBaseTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateTestCase;
+use Drupal\Tests\migrate\MigrateTestCase;
 
 /**
  * Tests the D6 SQL base class.
@@ -135,7 +135,7 @@ public function testVariableGet() {
   }
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
@@ -180,7 +180,7 @@ public function query() {
    * @param \Drupal\Core\Database\Connection
    *   The new conection to use.
    *
-   * @see \Drupal\migrate\Tests\MigrateSqlTestCase
+   * @see \Drupal\Tests\migrate\MigrateSqlTestCase
    */
   public function setDatabase(Connection $database) {
     $this->database = $database;
@@ -192,7 +192,7 @@ public function setDatabase(Connection $database) {
    * @param \Drupal\Core\Extension\ModuleHandlerInterface
    *   The new module handler to use.
    *
-   * @see \Drupal\migrate\Tests\MigrateSqlTestCase
+   * @see \Drupal\Tests\migrate\MigrateSqlTestCase
    */
   public function setModuleHandler(ModuleHandlerInterface $module_handler) {
     $this->moduleHandler = $module_handler;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/FieldInstancePerViewModeTest.php b/core/modules/migrate_drupal/tests/src/source/d6/FieldInstancePerViewModeTest.php
index ae0e470..325b37a 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/FieldInstancePerViewModeTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/FieldInstancePerViewModeTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\FieldInstancePerViewModeTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\FieldInstancePerViewModeTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 field instance per view mode source.
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/FieldInstanceTest.php b/core/modules/migrate_drupal/tests/src/source/d6/FieldInstanceTest.php
index 3c8abcf..38e4875 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/FieldInstanceTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/FieldInstanceTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\FieldInstanceTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\FieldInstanceTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 field instance source.
@@ -114,7 +114,7 @@ public function testRetrieval() {
   }
 
 }
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/FieldTest.php b/core/modules/migrate_drupal/tests/src/source/d6/FieldTest.php
index e1403d1..3605354 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/FieldTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/FieldTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\FieldTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\FieldTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 field source.
@@ -91,7 +91,7 @@ public static function getInfo() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/FileTest.php b/core/modules/migrate_drupal/tests/src/source/d6/FileTest.php
index c8a7505..5b6d461 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/FileTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/FileTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\FileTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\FileTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 file source.
@@ -74,7 +74,7 @@ protected function setUp() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/FilterFormatTest.php b/core/modules/migrate_drupal/tests/src/source/d6/FilterFormatTest.php
index 11468df..d7161e2 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/FilterFormatTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/FilterFormatTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\FilterFormatTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\FilterFormatTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests comment migration from D6 to D8.
@@ -125,7 +125,7 @@ protected function setUp() {
   }
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/MenuTest.php b/core/modules/migrate_drupal/tests/src/source/d6/MenuTest.php
index 081c462..39032d4 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/MenuTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/MenuTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\MenuTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\MenuTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 menu source.
@@ -73,7 +73,7 @@ protected function setUp() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/NodeRevisionTest.php b/core/modules/migrate_drupal/tests/src/source/d6/NodeRevisionTest.php
index d895ed5..6429a24 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/NodeRevisionTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/NodeRevisionTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\NodeRevisionTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\NodeRevisionTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 node revision source.
@@ -346,7 +346,7 @@ public function testRetrieval() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/NodeTest.php b/core/modules/migrate_drupal/tests/src/source/d6/NodeTest.php
index 311f938..fef08a3 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/NodeTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/NodeTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\NodeTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\NodeTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 node source
@@ -131,7 +131,7 @@ protected function setUp() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/NodeTypeTest.php b/core/modules/migrate_drupal/tests/src/source/d6/NodeTypeTest.php
index ab22f18..5d27d05 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/NodeTypeTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/NodeTypeTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\NodeTypeTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\NodeTypeTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 node type source.
@@ -88,7 +88,7 @@ public static function getInfo() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/ProfileFieldTest.php b/core/modules/migrate_drupal/tests/src/source/d6/ProfileFieldTest.php
index 80728df..8e64074 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/ProfileFieldTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/ProfileFieldTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\ProfileFieldTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\ProfileFieldTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 profile source.
@@ -104,7 +104,7 @@ public static function getInfo() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/RoleTest.php b/core/modules/migrate_drupal/tests/src/source/d6/RoleTest.php
index a346a79..314be83 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/RoleTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/RoleTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\RoleTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\RoleTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 user role source.
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/TermSourceWithVocabularyFilterTest.php b/core/modules/migrate_drupal/tests/src/source/d6/TermSourceWithVocabularyFilterTest.php
index 8149094..d35ac3b 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/TermSourceWithVocabularyFilterTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/TermSourceWithVocabularyFilterTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\TermSourceWithVocabularyFilterTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\TermSourceWithVocabularyFilterTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 /**
  * Tests the Drupal 6 taxonomy term source with vocabulary filter.
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/TermTest.php b/core/modules/migrate_drupal/tests/src/source/d6/TermTest.php
index e975441..df8656b 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/TermTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/TermTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\TermTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\TermTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 /**
  * Tests the Drupal 6 taxonomy term source.
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/TermTestBase.php b/core/modules/migrate_drupal/tests/src/source/d6/TermTestBase.php
index 43e2e15..fb9768e 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/TermTestBase.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/TermTestBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\TermTestBase.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\TermTestBase.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Base class for taxonomy term source unit tests.
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/TestComment.php b/core/modules/migrate_drupal/tests/src/source/d6/TestComment.php
index aa4e604..29818ce 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/TestComment.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/TestComment.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\TestComment.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\TestComment.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/TestTerm.php b/core/modules/migrate_drupal/tests/src/source/d6/TestTerm.php
index f8fdf36..ae35ada 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/TestTerm.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/TestTerm.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\TestTerm.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\TestTerm.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/UrlAliasTest.php b/core/modules/migrate_drupal/tests/src/source/d6/UrlAliasTest.php
index c5d584e..b8b2a8d 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/UrlAliasTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/UrlAliasTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\UrlAliasTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\UrlAliasTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 url alias source.
@@ -66,7 +66,7 @@ public static function getInfo() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/UserPictureTest.php b/core/modules/migrate_drupal/tests/src/source/d6/UserPictureTest.php
index ce6beed..33bb8ac 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/UserPictureTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/UserPictureTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\UserPictureTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\UserPictureTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 user picture source.
@@ -61,7 +61,7 @@ public static function getInfo() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/UserTest.php b/core/modules/migrate_drupal/tests/src/source/d6/UserTest.php
index 17e93bb..4066fa7 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/UserTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/UserTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\CommentTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\CommentTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 user source.
@@ -93,7 +93,7 @@ protected function setUp() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/ViewModeTest.php b/core/modules/migrate_drupal/tests/src/source/d6/ViewModeTest.php
index 8e07a8e..78c4e21 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/ViewModeTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/ViewModeTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\ViewModeTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\ViewModeTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 per view mode source.
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/VocabularyTest.php b/core/modules/migrate_drupal/tests/src/source/d6/VocabularyTest.php
index d4b6ab0..e73e5b4 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/VocabularyTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/VocabularyTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\source\d6\VocabularyTest.
+ * Contains \Drupal\Tests\migrate_drupal\source\d6\VocabularyTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
-use Drupal\migrate\Tests\MigrateSqlSourceTestCase;
+use Drupal\Tests\migrate\MigrateSqlSourceTestCase;
 
 /**
  * Tests the Drupal 6 vocabulary source.
@@ -91,7 +91,7 @@ protected function setUp() {
 
 }
 
-namespace Drupal\migrate_drupal\Tests\source\d6;
+namespace Drupal\Tests\migrate_drupal\source\d6;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/node/tests/src/Plugin/views/field/NodeBulkFormTest.php b/core/modules/node/tests/src/Plugin/views/field/NodeBulkFormTest.php
index 5deb7c5..e2fd33b 100644
--- a/core/modules/node/tests/src/Plugin/views/field/NodeBulkFormTest.php
+++ b/core/modules/node/tests/src/Plugin/views/field/NodeBulkFormTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Plugin\views\field\NodeBulkFormTest.
+ * Contains \Drupal\Tests\node\Plugin\views\field\NodeBulkFormTest.
  */
 
-namespace Drupal\node\Tests\Plugin\views\field;
+namespace Drupal\Tests\node\Plugin\views\field;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\node\Plugin\views\field\NodeBulkForm;
diff --git a/core/modules/path/tests/src/Field/PathFieldDefinitionTest.php b/core/modules/path/tests/src/Field/PathFieldDefinitionTest.php
index afc56f2..b29599d 100644
--- a/core/modules/path/tests/src/Field/PathFieldDefinitionTest.php
+++ b/core/modules/path/tests/src/Field/PathFieldDefinitionTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\path\Tests\Plugin\Field\FieldType\PathFieldDefinitionTest
+ * Contains \Drupal\Tests\path\Plugin\Field\FieldType\PathFieldDefinitionTest
  */
 
-namespace Drupal\path\Tests\Field;
+namespace Drupal\Tests\path\Field;
 
 use Drupal\Tests\Core\Field\FieldDefinitionTestBase;
 
diff --git a/core/modules/quickedit/tests/src/Access/EditEntityAccessCheckTest.php b/core/modules/quickedit/tests/src/Access/EditEntityAccessCheckTest.php
index 6596ccb..7a03e42 100644
--- a/core/modules/quickedit/tests/src/Access/EditEntityAccessCheckTest.php
+++ b/core/modules/quickedit/tests/src/Access/EditEntityAccessCheckTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\quickedit\Tests\Access\EditEntityAccessCheckTest.
+ * Contains \Drupal\Tests\quickedit\Access\EditEntityAccessCheckTest.
  */
 
-namespace Drupal\quickedit\Tests\Access;
+namespace Drupal\Tests\quickedit\Access;
 
 use Symfony\Component\HttpFoundation\Request;
 use Drupal\Core\Access\AccessCheckInterface;
@@ -67,7 +67,7 @@ protected function setUp() {
   /**
    * Provides test data for testAccess().
    *
-   * @see \Drupal\quickedit\Tests\quickedit\Access\EditEntityAccessCheckTest::testAccess()
+   * @see \Drupal\Tests\quickedit\quickedit\Access\EditEntityAccessCheckTest::testAccess()
    */
   public function providerTestAccess() {
     $editable_entity = $this->getMockBuilder('Drupal\entity_test\Entity\EntityTest')
diff --git a/core/modules/quickedit/tests/src/Access/EditEntityFieldAccessCheckTest.php b/core/modules/quickedit/tests/src/Access/EditEntityFieldAccessCheckTest.php
index d02c092..226f933 100644
--- a/core/modules/quickedit/tests/src/Access/EditEntityFieldAccessCheckTest.php
+++ b/core/modules/quickedit/tests/src/Access/EditEntityFieldAccessCheckTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\quickedit\Tests\Access\EditEntityFieldAccessCheckTest.
+ * Contains \Drupal\Tests\quickedit\Access\EditEntityFieldAccessCheckTest.
  */
 
-namespace Drupal\quickedit\Tests\Access;
+namespace Drupal\Tests\quickedit\Access;
 
 use Symfony\Component\HttpFoundation\Request;
 use Drupal\Core\Access\AccessCheckInterface;
@@ -69,7 +69,7 @@ protected function setUp() {
   /**
    * Provides test data for testAccess().
    *
-   * @see \Drupal\edit\Tests\quickedit\Access\EditEntityFieldAccessCheckTest::testAccess()
+   * @see \Drupal\Tests\edit\quickedit\Access\EditEntityFieldAccessCheckTest::testAccess()
    */
   public function providerTestAccess() {
     $editable_entity = $this->createMockEntity();
diff --git a/core/modules/rdf/tests/src/RdfMappingConfigEntityUnitTest.php b/core/modules/rdf/tests/src/RdfMappingConfigEntityUnitTest.php
index 6c2793d..4cf1550 100644
--- a/core/modules/rdf/tests/src/RdfMappingConfigEntityUnitTest.php
+++ b/core/modules/rdf/tests/src/RdfMappingConfigEntityUnitTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\rdf\Tests\RdfMappingConfigEntityUnitTest.
+ * Contains \Drupal\Tests\rdf\RdfMappingConfigEntityUnitTest.
  */
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/responsive_image/tests/src/ResponsiveImageMappingEntityTest.php b/core/modules/responsive_image/tests/src/ResponsiveImageMappingEntityTest.php
index 8565c3b..5d15017 100644
--- a/core/modules/responsive_image/tests/src/ResponsiveImageMappingEntityTest.php
+++ b/core/modules/responsive_image/tests/src/ResponsiveImageMappingEntityTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\responsive_image\Tests\ResponsiveImageMappingEntityTest.
+ * Contains \Drupal\Tests\responsive_image\ResponsiveImageMappingEntityTest.
  */
 
-namespace Drupal\responsive_image\Tests;
+namespace Drupal\Tests\responsive_image;
 
 use Drupal\responsive_image\Entity\ResponsiveImageMapping;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/rest/tests/src/CollectRoutesTest.php b/core/modules/rest/tests/src/CollectRoutesTest.php
index f511192..d640a25 100644
--- a/core/modules/rest/tests/src/CollectRoutesTest.php
+++ b/core/modules/rest/tests/src/CollectRoutesTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\rest\Tests\CollectRoutesTest.
+ * Contains \Drupal\Tests\rest\CollectRoutesTest.
  */
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
diff --git a/core/modules/search/tests/src/SearchPageRepositoryTest.php b/core/modules/search/tests/src/SearchPageRepositoryTest.php
index 334f995..a5d81d3 100644
--- a/core/modules/search/tests/src/SearchPageRepositoryTest.php
+++ b/core/modules/search/tests/src/SearchPageRepositoryTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\search\Tests\SearchPageRepositoryTest.
+ * Contains \Drupal\Tests\search\SearchPageRepositoryTest.
  */
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search;
 
 use Drupal\search\Entity\SearchPage;
 use Drupal\search\SearchPageRepository;
@@ -266,7 +266,7 @@ public function testSortSearchPages() {
     $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
     $entity_type->expects($this->any())
       ->method('getClass')
-      ->will($this->returnValue('Drupal\search\Tests\TestSearchPage'));
+      ->will($this->returnValue('Drupal\Tests\search\TestSearchPage'));
     $this->storage->expects($this->once())
       ->method('getEntityType')
       ->will($this->returnValue($entity_type));
diff --git a/core/modules/search/tests/src/SearchPluginBagTest.php b/core/modules/search/tests/src/SearchPluginBagTest.php
index c2cf9af..15718e0 100644
--- a/core/modules/search/tests/src/SearchPluginBagTest.php
+++ b/core/modules/search/tests/src/SearchPluginBagTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\search\Tests\SearchPluginBagTest.
+ * Contains \Drupal\Tests\search\SearchPluginBagTest.
  */
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search;
 
 use Drupal\search\Plugin\SearchPluginBag;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/serialization/tests/src/Encoder/JsonEncoderTest.php b/core/modules/serialization/tests/src/Encoder/JsonEncoderTest.php
index f4dcc1b..8a18376 100644
--- a/core/modules/serialization/tests/src/Encoder/JsonEncoderTest.php
+++ b/core/modules/serialization/tests/src/Encoder/JsonEncoderTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\Tests\Encoder\JsonEncoderTest.
+ * Contains \Drupal\Tests\serialization\Encoder\JsonEncoderTest.
  */
 
-namespace Drupal\serialization\Tests\Encoder;
+namespace Drupal\Tests\serialization\Encoder;
 
 use Drupal\serialization\Encoder\JsonEncoder;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/serialization/tests/src/Encoder/XmlEncoderTest.php b/core/modules/serialization/tests/src/Encoder/XmlEncoderTest.php
index eef24b9..7165acc 100644
--- a/core/modules/serialization/tests/src/Encoder/XmlEncoderTest.php
+++ b/core/modules/serialization/tests/src/Encoder/XmlEncoderTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\Tests\Encoder\XmlEncoderTest.
+ * Contains \Drupal\Tests\serialization\Encoder\XmlEncoderTest.
  */
 
-namespace Drupal\serialization\Tests\Encoder;
+namespace Drupal\Tests\serialization\Encoder;
 
 use Drupal\serialization\Encoder\XmlEncoder;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/serialization/tests/src/EntityResolver/ChainEntityResolverTest.php b/core/modules/serialization/tests/src/EntityResolver/ChainEntityResolverTest.php
index 5deda2f..e90781c 100644
--- a/core/modules/serialization/tests/src/EntityResolver/ChainEntityResolverTest.php
+++ b/core/modules/serialization/tests/src/EntityResolver/ChainEntityResolverTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\Tests\EntityResolver\ChainEntityResolverTest.
+ * Contains \Drupal\Tests\serialization\EntityResolver\ChainEntityResolverTest.
  */
 
-namespace Drupal\serialization\Tests\EntityResolver;
+namespace Drupal\Tests\serialization\EntityResolver;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\serialization\EntityResolver\ChainEntityResolver;
diff --git a/core/modules/serialization/tests/src/EntityResolver/UuidResolverTest.php b/core/modules/serialization/tests/src/EntityResolver/UuidResolverTest.php
index 9d49dce..22b99e2 100644
--- a/core/modules/serialization/tests/src/EntityResolver/UuidResolverTest.php
+++ b/core/modules/serialization/tests/src/EntityResolver/UuidResolverTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\Tests\EntityResolver\UuidResolverTest.
+ * Contains \Drupal\Tests\serialization\EntityResolver\UuidResolverTest.
  */
 
-namespace Drupal\serialization\Tests\EntityResolver;
+namespace Drupal\Tests\serialization\EntityResolver;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\serialization\EntityResolver\UuidResolver;
diff --git a/core/modules/serialization/tests/src/Normalizer/ConfigEntityNormalizerTest.php b/core/modules/serialization/tests/src/Normalizer/ConfigEntityNormalizerTest.php
index 795ad6d..e839875 100644
--- a/core/modules/serialization/tests/src/Normalizer/ConfigEntityNormalizerTest.php
+++ b/core/modules/serialization/tests/src/Normalizer/ConfigEntityNormalizerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\Tests\Normalizer\ConfigEntityNormalizerTest.
+ * Contains \Drupal\Tests\serialization\Normalizer\ConfigEntityNormalizerTest.
  */
 
-namespace Drupal\serialization\Tests\Normalizer;
+namespace Drupal\Tests\serialization\Normalizer;
 
 use Drupal\serialization\Normalizer\ConfigEntityNormalizer;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/serialization/tests/src/Normalizer/EntityNormalizerTest.php b/core/modules/serialization/tests/src/Normalizer/EntityNormalizerTest.php
index 968ebfb..0052dd4 100644
--- a/core/modules/serialization/tests/src/Normalizer/EntityNormalizerTest.php
+++ b/core/modules/serialization/tests/src/Normalizer/EntityNormalizerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\Tests\Normalizer\EntityNormalizerTest.
+ * Contains \Drupal\Tests\serialization\Normalizer\EntityNormalizerTest.
  */
 
-namespace Drupal\serialization\Tests\Normalizer;
+namespace Drupal\Tests\serialization\Normalizer;
 
 use Drupal\serialization\Normalizer\EntityNormalizer;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/serialization/tests/src/Normalizer/ListNormalizerTest.php b/core/modules/serialization/tests/src/Normalizer/ListNormalizerTest.php
index 2462b4a..6340715 100644
--- a/core/modules/serialization/tests/src/Normalizer/ListNormalizerTest.php
+++ b/core/modules/serialization/tests/src/Normalizer/ListNormalizerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\Tests\Normalizer\ListNormalizerTest.
+ * Contains \Drupal\Tests\serialization\Normalizer\ListNormalizerTest.
  */
 
-namespace Drupal\serialization\Tests\Normalizer;
+namespace Drupal\Tests\serialization\Normalizer;
 
 use Drupal\Core\TypedData\DataDefinition;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/serialization/tests/src/Normalizer/NormalizerBaseTest.php b/core/modules/serialization/tests/src/Normalizer/NormalizerBaseTest.php
index f03755c..6d03f86 100644
--- a/core/modules/serialization/tests/src/Normalizer/NormalizerBaseTest.php
+++ b/core/modules/serialization/tests/src/Normalizer/NormalizerBaseTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\Tests\Normalizer\NormalizerBaseTest.
+ * Contains \Drupal\Tests\serialization\Normalizer\NormalizerBaseTest.
  */
 
-namespace Drupal\serialization\Tests\Normalizer;
+namespace Drupal\Tests\serialization\Normalizer;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\serialization\Normalizer\NormalizerBase;
@@ -43,7 +43,7 @@ public static function getInfo() {
    *   (optional) the supported interface or class to set on the normalizer.
    */
   public function testSupportsNormalization($expected_return, $data, $supported_interface_or_class = NULL) {
-    $normalizer_base = $this->getMockForAbstractClass('Drupal\serialization\Tests\Normalizer\TestNormalizerBase');
+    $normalizer_base = $this->getMockForAbstractClass('Drupal\Tests\serialization\Normalizer\TestNormalizerBase');
 
     if (isset($supported_interface_or_class)) {
       $normalizer_base->setSupportedInterfaceOrClass($supported_interface_or_class);
diff --git a/core/modules/serialization/tests/src/Normalizer/TypedDataNormalizerTest.php b/core/modules/serialization/tests/src/Normalizer/TypedDataNormalizerTest.php
index 3e1dafd..288c855 100644
--- a/core/modules/serialization/tests/src/Normalizer/TypedDataNormalizerTest.php
+++ b/core/modules/serialization/tests/src/Normalizer/TypedDataNormalizerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\Tests\Normalizer\TypedDataNormalizerTest
+ * Contains \Drupal\Tests\serialization\Normalizer\TypedDataNormalizerTest
  */
 
-namespace Drupal\serialization\Tests\Normalizer;
+namespace Drupal\Tests\serialization\Normalizer;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\serialization\Normalizer\TypedDataNormalizer;
diff --git a/core/modules/shortcut/tests/src/Menu/ShortcutLocalTasksTest.php b/core/modules/shortcut/tests/src/Menu/ShortcutLocalTasksTest.php
index c4b4564..7179b89 100644
--- a/core/modules/shortcut/tests/src/Menu/ShortcutLocalTasksTest.php
+++ b/core/modules/shortcut/tests/src/Menu/ShortcutLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\shortcut\Tests\Menu\ShortcutLocalTasksTest.
+ * Contains \Drupal\Tests\shortcut\Menu\ShortcutLocalTasksTest.
  */
 
-namespace Drupal\shortcut\Tests\Menu;
+namespace Drupal\Tests\shortcut\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 8cc079f..0389af4 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -577,8 +577,7 @@ function simpletest_classloader_register() {
   foreach ($types as $type) {
     foreach ($extensions[$type] as $name => $uri) {
       drupal_classloader_register($name, dirname($uri));
-      $classloader->addPsr4('Drupal\\' . $name . '\\Tests\\', array(
-        DRUPAL_ROOT . '/' . dirname($uri) . '/tests/Drupal/' . $name . '/Tests',
+      $classloader->addPsr4('Drupal\\Tests\\' . $name . '\\', array(
         DRUPAL_ROOT . '/' . dirname($uri) . '/tests/src',
       ));
       // While being there, prime drupal_get_filename().
diff --git a/core/modules/simpletest/tests/src/PhpUnitAutoloaderTest.php b/core/modules/simpletest/tests/src/PhpUnitAutoloaderTest.php
index bcb940e..7ff4163 100644
--- a/core/modules/simpletest/tests/src/PhpUnitAutoloaderTest.php
+++ b/core/modules/simpletest/tests/src/PhpUnitAutoloaderTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\simpletest\Tests\PhpUnitAutoloaderTest.
+ * Contains \Drupal\Tests\simpletest\PhpUnitAutoloaderTest.
  */
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest;
 
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/modules/simpletest/tests/src/PhpUnitErrorTest.php b/core/modules/simpletest/tests/src/PhpUnitErrorTest.php
index fdd38fa..43b5a21 100644
--- a/core/modules/simpletest/tests/src/PhpUnitErrorTest.php
+++ b/core/modules/simpletest/tests/src/PhpUnitErrorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest;
 
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/modules/simpletest/tests/src/TestBaseTest.php b/core/modules/simpletest/tests/src/TestBaseTest.php
index 79b0345..66db5df 100644
--- a/core/modules/simpletest/tests/src/TestBaseTest.php
+++ b/core/modules/simpletest/tests/src/TestBaseTest.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\simpletest\TestBaseTest.
  */
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest;
 
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/modules/simpletest/tests/src/WebTestBaseTest.php b/core/modules/simpletest/tests/src/WebTestBaseTest.php
index 8bce846..ab73365 100644
--- a/core/modules/simpletest/tests/src/WebTestBaseTest.php
+++ b/core/modules/simpletest/tests/src/WebTestBaseTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\simpletest\Tests\WebTestBaseTest.
+ * Contains \Drupal\Tests\simpletest\WebTestBaseTest.
  */
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest;
 
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/modules/system/tests/src/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php b/core/modules/system/tests/src/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
index b7a145b..3e6b6d7 100644
--- a/core/modules/system/tests/src/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
+++ b/core/modules/system/tests/src/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Breadcrumbs\PathBasedBreadcrumbBuilderTest
+ * Contains \Drupal\Tests\system\Breadcrumbs\PathBasedBreadcrumbBuilderTest
  */
 
-namespace Drupal\system\Tests\Breadcrumbs;
+namespace Drupal\Tests\system\Breadcrumbs;
 
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\TranslationInterface;
@@ -289,7 +289,7 @@ public function testBuildWithException($exception_class, $exception_argument) {
    * @return array
    *   The list of exception test cases.
    *
-   * @see \Drupal\system\Tests\Breadcrumbs\PathBasedBreadcrumbBuilderTest::testBuildWithException()
+   * @see \Drupal\Tests\system\Breadcrumbs\PathBasedBreadcrumbBuilderTest::testBuildWithException()
    */
   public function providerTestBuildWithException() {
     return array(
diff --git a/core/modules/system/tests/src/Controller/SystemControllerTest.php b/core/modules/system/tests/src/Controller/SystemControllerTest.php
index 199a44f..567aba6 100644
--- a/core/modules/system/tests/src/Controller/SystemControllerTest.php
+++ b/core/modules/system/tests/src/Controller/SystemControllerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Controller\SystemControllerTest.
+ * Contains \Drupal\Tests\system\Controller\SystemControllerTest.
  */
 
-namespace Drupal\system\Tests\Controller;
+namespace Drupal\Tests\system\Controller;
 
 use Drupal\Component\Serialization\Json;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/core/modules/system/tests/src/Menu/SystemLocalTasksTest.php b/core/modules/system/tests/src/Menu/SystemLocalTasksTest.php
index 9cd7ebc..5c4981d 100644
--- a/core/modules/system/tests/src/Menu/SystemLocalTasksTest.php
+++ b/core/modules/system/tests/src/Menu/SystemLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Menu\SystemLocalTasksTest.
+ * Contains \Drupal\Tests\system\Menu\SystemLocalTasksTest.
  */
 
-namespace Drupal\system\Tests\Menu;
+namespace Drupal\Tests\system\Menu;
 
 use Drupal\Core\Extension\Extension;
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
diff --git a/core/modules/system/tests/src/Transliteration/MachineNameControllerTest.php b/core/modules/system/tests/src/Transliteration/MachineNameControllerTest.php
index fddac33..9faa0d4 100644
--- a/core/modules/system/tests/src/Transliteration/MachineNameControllerTest.php
+++ b/core/modules/system/tests/src/Transliteration/MachineNameControllerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Transliteration\MachineNameControllerTest.
+ * Contains \Drupal\Tests\system\Transliteration\MachineNameControllerTest.
  */
 
-namespace Drupal\system\Tests\Transliteration;
+namespace Drupal\Tests\system\Transliteration;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\Component\Transliteration\PHPTransliteration;
diff --git a/core/modules/taxonomy/tests/src/Menu/TaxonomyLocalTasksTest.php b/core/modules/taxonomy/tests/src/Menu/TaxonomyLocalTasksTest.php
index d51ff7a..201399c 100644
--- a/core/modules/taxonomy/tests/src/Menu/TaxonomyLocalTasksTest.php
+++ b/core/modules/taxonomy/tests/src/Menu/TaxonomyLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Menu\TaxonomyLocalTasksTest.
+ * Contains \Drupal\Tests\taxonomy\Menu\TaxonomyLocalTasksTest.
  */
 
-namespace Drupal\taxonomy\Tests\Menu;
+namespace Drupal\Tests\taxonomy\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 
diff --git a/core/modules/tour/tests/src/Entity/TourTest.php b/core/modules/tour/tests/src/Entity/TourTest.php
index 5335fc8..ecf98e6 100644
--- a/core/modules/tour/tests/src/Entity/TourTest.php
+++ b/core/modules/tour/tests/src/Entity/TourTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\tour\Tests\Entity\TourTest.
+ * Contains \Drupal\Tests\tour\Entity\TourTest.
  */
 
-namespace Drupal\tour\Tests\Entity;
+namespace Drupal\Tests\tour\Entity;
 
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/modules/update/tests/src/UpdateFetcherTest.php b/core/modules/update/tests/src/UpdateFetcherTest.php
index 4a31916..c7776df 100644
--- a/core/modules/update/tests/src/UpdateFetcherTest.php
+++ b/core/modules/update/tests/src/UpdateFetcherTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\update\Tests\UpdateFetcherTest.
+ * Contains \Drupal\Tests\update\UpdateFetcherTest.
  */
 
-namespace Drupal\update\Tests;
+namespace Drupal\Tests\update;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\update\UpdateFetcher;
diff --git a/core/modules/user/tests/src/Menu/UserLocalTasksTest.php b/core/modules/user/tests/src/Menu/UserLocalTasksTest.php
index b8897ce..62eb502 100644
--- a/core/modules/user/tests/src/Menu/UserLocalTasksTest.php
+++ b/core/modules/user/tests/src/Menu/UserLocalTasksTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Menu\UserLocalTasksTest.
+ * Contains \Drupal\Tests\user\Menu\UserLocalTasksTest.
  */
 
-namespace Drupal\user\Tests\Menu;
+namespace Drupal\Tests\user\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTest;
 
diff --git a/core/modules/user/tests/src/PermissionsHashTest.php b/core/modules/user/tests/src/PermissionsHashTest.php
index 453bcfb..042838c 100644
--- a/core/modules/user/tests/src/PermissionsHashTest.php
+++ b/core/modules/user/tests/src/PermissionsHashTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\PermissionsHashTest.
+ * Contains \Drupal\Tests\user\PermissionsHashTest.
  */
 
-namespace Drupal\user\Tests {
+namespace Drupal\Tests\user {
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\Component\Utility\Crypt;
diff --git a/core/modules/user/tests/src/Plugin/Action/AddRoleUserTest.php b/core/modules/user/tests/src/Plugin/Action/AddRoleUserTest.php
index fdd4485..1551a9e 100644
--- a/core/modules/user/tests/src/Plugin/Action/AddRoleUserTest.php
+++ b/core/modules/user/tests/src/Plugin/Action/AddRoleUserTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Plugin\Action\AddRoleUserTest.
+ * Contains \Drupal\Tests\user\Plugin\Action\AddRoleUserTest.
  */
 
-namespace Drupal\user\Tests\Plugin\Action;
+namespace Drupal\Tests\user\Plugin\Action;
 
 use Drupal\user\Plugin\Action\AddRoleUser;
 
diff --git a/core/modules/user/tests/src/Plugin/Action/RemoveRoleUserTest.php b/core/modules/user/tests/src/Plugin/Action/RemoveRoleUserTest.php
index e72113c..1caefc7 100644
--- a/core/modules/user/tests/src/Plugin/Action/RemoveRoleUserTest.php
+++ b/core/modules/user/tests/src/Plugin/Action/RemoveRoleUserTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Plugin\Action\RemoveRoleUserTest.
+ * Contains \Drupal\Tests\user\Plugin\Action\RemoveRoleUserTest.
  */
 
-namespace Drupal\user\Tests\Plugin\Action;
+namespace Drupal\Tests\user\Plugin\Action;
 
 use Drupal\user\Plugin\Action\RemoveRoleUser;
 
diff --git a/core/modules/user/tests/src/Plugin/Action/RoleUserTestBase.php b/core/modules/user/tests/src/Plugin/Action/RoleUserTestBase.php
index 54c8fa0..c451b7d 100644
--- a/core/modules/user/tests/src/Plugin/Action/RoleUserTestBase.php
+++ b/core/modules/user/tests/src/Plugin/Action/RoleUserTestBase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Plugin\Action\RoleUserTestBase.
+ * Contains \Drupal\Tests\user\Plugin\Action\RoleUserTestBase.
  */
 
-namespace Drupal\user\Tests\Plugin\Action;
+namespace Drupal\Tests\user\Plugin\Action;
 
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/modules/user/tests/src/Plugin/Core/Entity/UserTest.php b/core/modules/user/tests/src/Plugin/Core/Entity/UserTest.php
index bc341b2..63ffeab 100644
--- a/core/modules/user/tests/src/Plugin/Core/Entity/UserTest.php
+++ b/core/modules/user/tests/src/Plugin/Core/Entity/UserTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Plugin\Core\Entity\UserTest.
+ * Contains \Drupal\Tests\user\Plugin\Core\Entity\UserTest.
  */
 
-namespace Drupal\user\Tests\Plugin\Core\Entity {
+namespace Drupal\Tests\user\Plugin\Core\Entity {
 
 use Drupal\Tests\Core\Session\UserSessionTest;
 use Drupal\user\Entity\User;
diff --git a/core/modules/user/tests/src/Plugin/views/field/UserBulkFormTest.php b/core/modules/user/tests/src/Plugin/views/field/UserBulkFormTest.php
index 642aacd..bf037c3 100644
--- a/core/modules/user/tests/src/Plugin/views/field/UserBulkFormTest.php
+++ b/core/modules/user/tests/src/Plugin/views/field/UserBulkFormTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Plugin\views\field\UserBulkFormTest.
+ * Contains \Drupal\Tests\user\Plugin\views\field\UserBulkFormTest.
  */
 
-namespace Drupal\user\Tests\Plugin\views\field;
+namespace Drupal\Tests\user\Plugin\views\field;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/user/tests/src/TempStoreTest.php b/core/modules/user/tests/src/TempStoreTest.php
index af54c81..b11d762 100644
--- a/core/modules/user/tests/src/TempStoreTest.php
+++ b/core/modules/user/tests/src/TempStoreTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\TempStoreTest.
+ * Contains \Drupal\Tests\user\TempStoreTest.
  */
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\user\TempStore;
diff --git a/core/modules/user/tests/src/UserAuthTest.php b/core/modules/user/tests/src/UserAuthTest.php
index bd069be..dc45ebf 100644
--- a/core/modules/user/tests/src/UserAuthTest.php
+++ b/core/modules/user/tests/src/UserAuthTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\UserAuthTest.
+ * Contains \Drupal\Tests\user\UserAuthTest.
  */
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\user\UserAuth;
diff --git a/core/modules/user/tests/src/Views/Argument/RolesRidTest.php b/core/modules/user/tests/src/Views/Argument/RolesRidTest.php
index fabfec0..3c10f82 100644
--- a/core/modules/user/tests/src/Views/Argument/RolesRidTest.php
+++ b/core/modules/user/tests/src/Views/Argument/RolesRidTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Views\Argument\RolesRidTest.
+ * Contains \Drupal\Tests\user\Views\Argument\RolesRidTest.
  */
 
-namespace Drupal\user\Tests\Views\Argument;
+namespace Drupal\Tests\user\Views\Argument;
 
 use Drupal\Component\Utility\String;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
diff --git a/core/modules/views/tests/src/Controller/ViewAjaxControllerTest.php b/core/modules/views/tests/src/Controller/ViewAjaxControllerTest.php
index 588eec7..5669cfc 100644
--- a/core/modules/views/tests/src/Controller/ViewAjaxControllerTest.php
+++ b/core/modules/views/tests/src/Controller/ViewAjaxControllerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Controller\ViewAjaxControllerTest.
+ * Contains \Drupal\Tests\views\Controller\ViewAjaxControllerTest.
  */
 
-namespace Drupal\views\Tests\Controller {
+namespace Drupal\Tests\views\Controller {
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Ajax\ViewAjaxResponse;
diff --git a/core/modules/views/tests/src/Entity/ViewTest.php b/core/modules/views/tests/src/Entity/ViewTest.php
index 20e0bf4..2a2f8a4 100644
--- a/core/modules/views/tests/src/Entity/ViewTest.php
+++ b/core/modules/views/tests/src/Entity/ViewTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Entity\ViewTest.
+ * Contains \Drupal\Tests\views\Entity\ViewTest.
  */
 
-namespace Drupal\views\Tests\Entity {
+namespace Drupal\Tests\views\Entity {
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Entity\EntityType;
diff --git a/core/modules/views/tests/src/EventSubscriber/RouteSubscriberTest.php b/core/modules/views/tests/src/EventSubscriber/RouteSubscriberTest.php
index 0510cd0..90deea1 100644
--- a/core/modules/views/tests/src/EventSubscriber/RouteSubscriberTest.php
+++ b/core/modules/views/tests/src/EventSubscriber/RouteSubscriberTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\EventSubscriber\RouteSubscriberTest.
+ * Contains \Drupal\Tests\views\EventSubscriber\RouteSubscriberTest.
  */
 
-namespace Drupal\views\Tests\EventSubscriber;
+namespace Drupal\Tests\views\EventSubscriber;
 
 use Drupal\Core\Routing\RouteBuildEvent;
 use Drupal\Tests\UnitTestCase;
@@ -37,7 +37,7 @@ class RouteSubscriberTest extends UnitTestCase {
   /**
    * The tested views route subscriber.
    *
-   * @var \Drupal\views\EventSubscriber\RouteSubscriber|\Drupal\views\Tests\EventSubscriber\TestRouteSubscriber
+   * @var \Drupal\views\EventSubscriber\RouteSubscriber|\Drupal\Tests\views\EventSubscriber\TestRouteSubscriber
    */
   protected $routeSubscriber;
 
diff --git a/core/modules/views/tests/src/Plugin/Block/ViewsBlockTest.php b/core/modules/views/tests/src/Plugin/Block/ViewsBlockTest.php
index c1029dd..ad7c1f4 100644
--- a/core/modules/views/tests/src/Plugin/Block/ViewsBlockTest.php
+++ b/core/modules/views/tests/src/Plugin/Block/ViewsBlockTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Plugin\Block\ViewsBlockTest.
+ * Contains \Drupal\Tests\views\Plugin\Block\ViewsBlockTest.
  */
 
-namespace Drupal\views\Tests\Plugin\Block {
+namespace Drupal\Tests\views\Plugin\Block {
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/views/tests/src/Plugin/Derivative/ViewsLocalTaskTest.php b/core/modules/views/tests/src/Plugin/Derivative/ViewsLocalTaskTest.php
index f58aaae..a968afa 100644
--- a/core/modules/views/tests/src/Plugin/Derivative/ViewsLocalTaskTest.php
+++ b/core/modules/views/tests/src/Plugin/Derivative/ViewsLocalTaskTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Plugin\Derivative\ViewsLocalTaskTest.
+ * Contains \Drupal\Tests\views\Plugin\Derivative\ViewsLocalTaskTest.
  */
 
-namespace Drupal\views\Tests\Plugin\Derivative;
+namespace Drupal\Tests\views\Plugin\Derivative;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Plugin\Derivative\ViewsLocalTask;
diff --git a/core/modules/views/tests/src/Plugin/area/MessagesTest.php b/core/modules/views/tests/src/Plugin/area/MessagesTest.php
index ccbf60c..1b329e1 100644
--- a/core/modules/views/tests/src/Plugin/area/MessagesTest.php
+++ b/core/modules/views/tests/src/Plugin/area/MessagesTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Plugin\area\MessagesTest.
+ * Contains \Drupal\Tests\views\Plugin\area\MessagesTest.
  */
 
-namespace Drupal\views\Tests\Plugin\area;
+namespace Drupal\Tests\views\Plugin\area;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Plugin\views\area\Messages;
diff --git a/core/modules/views/tests/src/Plugin/area/ResultTest.php b/core/modules/views/tests/src/Plugin/area/ResultTest.php
index 8751de0..e67d0e9 100644
--- a/core/modules/views/tests/src/Plugin/area/ResultTest.php
+++ b/core/modules/views/tests/src/Plugin/area/ResultTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Plugin\area\ResultTest.
+ * Contains \Drupal\Tests\views\Plugin\area\ResultTest.
  */
 
-namespace Drupal\views\Tests\Plugin\area;
+namespace Drupal\Tests\views\Plugin\area;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\ViewExecutable;
diff --git a/core/modules/views/tests/src/Plugin/argument_default/QueryParameterTest.php b/core/modules/views/tests/src/Plugin/argument_default/QueryParameterTest.php
index 9699816..4f088a7 100644
--- a/core/modules/views/tests/src/Plugin/argument_default/QueryParameterTest.php
+++ b/core/modules/views/tests/src/Plugin/argument_default/QueryParameterTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Plugin\argument_default\QueryParameterTest.
+ * Contains \Drupal\Tests\views\Plugin\argument_default\QueryParameterTest.
  */
 
-namespace Drupal\views\Tests\Plugin\argument_default;
+namespace Drupal\Tests\views\Plugin\argument_default;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Plugin\views\argument_default\QueryParameter;
diff --git a/core/modules/views/tests/src/Plugin/argument_default/RawTest.php b/core/modules/views/tests/src/Plugin/argument_default/RawTest.php
index a6437a2..cbc4fac 100644
--- a/core/modules/views/tests/src/Plugin/argument_default/RawTest.php
+++ b/core/modules/views/tests/src/Plugin/argument_default/RawTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Plugin\argument_default\RawTest.
+ * Contains \Drupal\Tests\views\Plugin\argument_default\RawTest.
  */
 
-namespace Drupal\views\Tests\Plugin\argument_default;
+namespace Drupal\Tests\views\Plugin\argument_default;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Plugin\views\argument_default\Raw;
diff --git a/core/modules/views/tests/src/Plugin/argument_validator/EntityTest.php b/core/modules/views/tests/src/Plugin/argument_validator/EntityTest.php
index fe96e66..7cef2ca 100644
--- a/core/modules/views/tests/src/Plugin/argument_validator/EntityTest.php
+++ b/core/modules/views/tests/src/Plugin/argument_validator/EntityTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Plugin\argument_validator\EntityTest.
+ * Contains \Drupal\Tests\views\Plugin\argument_validator\EntityTest.
  */
 
-namespace Drupal\views\Tests\Plugin\argument_validator;
+namespace Drupal\Tests\views\Plugin\argument_validator;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Plugin\views\argument_validator\Entity;
diff --git a/core/modules/views/tests/src/Plugin/display/PathPluginBaseTest.php b/core/modules/views/tests/src/Plugin/display/PathPluginBaseTest.php
index 596b805..867cd8d 100644
--- a/core/modules/views/tests/src/Plugin/display/PathPluginBaseTest.php
+++ b/core/modules/views/tests/src/Plugin/display/PathPluginBaseTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Plugin\display\PathPluginBaseTest.
+ * Contains \Drupal\Tests\views\Plugin\display\PathPluginBaseTest.
  */
 
-namespace Drupal\views\Tests\Plugin\display;
+namespace Drupal\Tests\views\Plugin\display;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/views/tests/src/Plugin/field/CounterTest.php b/core/modules/views/tests/src/Plugin/field/CounterTest.php
index 50028a4..2618080 100644
--- a/core/modules/views/tests/src/Plugin/field/CounterTest.php
+++ b/core/modules/views/tests/src/Plugin/field/CounterTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Plugin\field\CounterTest.
+ * Contains \Drupal\Tests\views\Plugin\field\CounterTest.
  */
 
-namespace Drupal\views\Tests\Plugin\field;
+namespace Drupal\Tests\views\Plugin\field;
 
 use Drupal\Component\Utility\String;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/views/tests/src/Plugin/pager/PagerPluginBaseTest.php b/core/modules/views/tests/src/Plugin/pager/PagerPluginBaseTest.php
index bdeb1b4..b9b90d5 100644
--- a/core/modules/views/tests/src/Plugin/pager/PagerPluginBaseTest.php
+++ b/core/modules/views/tests/src/Plugin/pager/PagerPluginBaseTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Plugin\pager\PagerPluginBaseTest
+ * Contains \Drupal\Tests\views\Plugin\pager\PagerPluginBaseTest
  */
 
-namespace Drupal\views\Tests\Plugin\pager;
+namespace Drupal\Tests\views\Plugin\pager;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Database\StatementInterface;
@@ -216,7 +216,7 @@ public function providerTestHasMoreRecords() {
    * @see \Drupal\views\Plugin\views\pager\PagerPluginBase::executeCountQuery()
    */
   public function testExecuteCountQueryWithoutOffset() {
-    $statement = $this->getMock('\Drupal\views\Tests\Plugin\pager\TestStatementInterface');
+    $statement = $this->getMock('\Drupal\Tests\views\Plugin\pager\TestStatementInterface');
 
     $statement->expects($this->once())
       ->method('fetchField')
@@ -240,7 +240,7 @@ public function testExecuteCountQueryWithoutOffset() {
    * @see \Drupal\views\Plugin\views\pager\PagerPluginBase::executeCountQuery()
    */
   public function testExecuteCountQueryWithOffset() {
-    $statement = $this->getMock('\Drupal\views\Tests\Plugin\pager\TestStatementInterface');
+    $statement = $this->getMock('\Drupal\Tests\views\Plugin\pager\TestStatementInterface');
 
     $statement->expects($this->once())
       ->method('fetchField')
diff --git a/core/modules/views/tests/src/PluginBaseTest.php b/core/modules/views/tests/src/PluginBaseTest.php
index ca4e106..df39641 100644
--- a/core/modules/views/tests/src/PluginBaseTest.php
+++ b/core/modules/views/tests/src/PluginBaseTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\PluginBaseTest.
+ * Contains \Drupal\Tests\views\PluginBaseTest.
  */
 
-namespace Drupal\views\Tests;
+namespace Drupal\Tests\views;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Tests\TestHelperPlugin;
diff --git a/core/modules/views/tests/src/PluginTypeListTest.php b/core/modules/views/tests/src/PluginTypeListTest.php
index abe8150..1434de8 100644
--- a/core/modules/views/tests/src/PluginTypeListTest.php
+++ b/core/modules/views/tests/src/PluginTypeListTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Definition of Drupal\views\Tests\PluginTypeListTest.
+ * Definition of Drupal\Tests\views\PluginTypeListTest.
  */
 
-namespace Drupal\views\Tests;
+namespace Drupal\Tests\views;
 
 use Drupal\views\ViewExecutable;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/views/tests/src/Routing/ViewPageControllerTest.php b/core/modules/views/tests/src/Routing/ViewPageControllerTest.php
index 94ce9a7..a62bd1c 100644
--- a/core/modules/views/tests/src/Routing/ViewPageControllerTest.php
+++ b/core/modules/views/tests/src/Routing/ViewPageControllerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Routing\ViewPageControllerTest.
+ * Contains \Drupal\Tests\views\Routing\ViewPageControllerTest.
  */
 
-namespace Drupal\views\Tests\Routing;
+namespace Drupal\Tests\views\Routing;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Routing\ViewPageController;
diff --git a/core/modules/views/tests/src/ViewExecutableFactoryTest.php b/core/modules/views/tests/src/ViewExecutableFactoryTest.php
index f4cc82b..f38b3dd 100644
--- a/core/modules/views/tests/src/ViewExecutableFactoryTest.php
+++ b/core/modules/views/tests/src/ViewExecutableFactoryTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\VIewExecutableFactoryTest.
+ * Contains \Drupal\Tests\views\VIewExecutableFactoryTest.
  */
 
-namespace Drupal\views\Tests;
+namespace Drupal\Tests\views;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\ViewExecutableFactory;
diff --git a/core/modules/views/tests/src/ViewExecutableUnitTest.php b/core/modules/views/tests/src/ViewExecutableUnitTest.php
index 6a18691..18778cf 100644
--- a/core/modules/views/tests/src/ViewExecutableUnitTest.php
+++ b/core/modules/views/tests/src/ViewExecutableUnitTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\ViewExecutableUnitTest.
+ * Contains \Drupal\Tests\views\ViewExecutableUnitTest.
  */
 
-namespace Drupal\views\Tests;
+namespace Drupal\Tests\views;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Entity\View;
diff --git a/core/modules/views/tests/src/ViewsDataHelperTest.php b/core/modules/views/tests/src/ViewsDataHelperTest.php
index 5fca8fe..fc62f0b 100644
--- a/core/modules/views/tests/src/ViewsDataHelperTest.php
+++ b/core/modules/views/tests/src/ViewsDataHelperTest.php
@@ -2,14 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\ViewsDataHelperTest.
+ * Contains \Drupal\Tests\views\ViewsDataHelperTest.
  */
 
-namespace Drupal\views\Tests;
+namespace Drupal\Tests\views;
 
 use Drupal\Component\Utility\String;
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\ViewsDataHelper;
+use Drupal\views\Tests\ViewTestData;
 
 /**
  * Tests the views data helper class.
diff --git a/core/modules/views/tests/src/ViewsDataTest.php b/core/modules/views/tests/src/ViewsDataTest.php
index 432e846..329ba75 100644
--- a/core/modules/views/tests/src/ViewsDataTest.php
+++ b/core/modules/views/tests/src/ViewsDataTest.php
@@ -2,14 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\ViewsDataTest.
+ * Contains \Drupal\Tests\views\ViewsDataTest.
  */
 
-namespace Drupal\views\Tests;
+namespace Drupal\Tests\views;
 
 use Drupal\Core\Language\Language;
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\ViewsData;
+use Drupal\views\Tests\ViewTestData;
 
 /**
  * Tests the fetching of views data.
diff --git a/core/modules/views/tests/src/ViewsTest.php b/core/modules/views/tests/src/ViewsTest.php
index 462cb28..069ee3d 100644
--- a/core/modules/views/tests/src/ViewsTest.php
+++ b/core/modules/views/tests/src/ViewsTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\ViewsTest.
+ * Contains \Drupal\Tests\views\ViewsTest.
  */
 
-namespace Drupal\views\Tests;
+namespace Drupal\Tests\views;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Views;
diff --git a/core/modules/views_ui/tests/src/Form/Ajax/RearrangeFilterTest.php b/core/modules/views_ui/tests/src/Form/Ajax/RearrangeFilterTest.php
index bed95df..195157f 100644
--- a/core/modules/views_ui/tests/src/Form/Ajax/RearrangeFilterTest.php
+++ b/core/modules/views_ui/tests/src/Form/Ajax/RearrangeFilterTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views_ui\Tests\Form\Ajax\RearrangeFilterTest.
+ * Contains \Drupal\Tests\views_ui\Form\Ajax\RearrangeFilterTest.
  */
 
-namespace Drupal\views_ui\Tests\Form\Ajax;
+namespace Drupal\Tests\views_ui\Form\Ajax;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views_ui\Form\Ajax\RearrangeFilter;
diff --git a/core/modules/views_ui/tests/src/ViewListBuilderTest.php b/core/modules/views_ui/tests/src/ViewListBuilderTest.php
index fb4a73a..8604712 100644
--- a/core/modules/views_ui/tests/src/ViewListBuilderTest.php
+++ b/core/modules/views_ui/tests/src/ViewListBuilderTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views_ui\Tests\ViewListBuilderTest.
+ * Contains \Drupal\Tests\views_ui\ViewListBuilderTest.
  */
 
-namespace Drupal\views_ui\Tests;
+namespace Drupal\Tests\views_ui;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Entity\EntityInterface;
diff --git a/core/modules/views_ui/tests/src/ViewUIObjectTest.php b/core/modules/views_ui/tests/src/ViewUIObjectTest.php
index f105b3a..5ed5efd 100644
--- a/core/modules/views_ui/tests/src/ViewUIObjectTest.php
+++ b/core/modules/views_ui/tests/src/ViewUIObjectTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views_ui\Tests\ViewUIObjectTest.
+ * Contains \Drupal\Tests\views_ui\ViewUIObjectTest.
  */
 
-namespace Drupal\views_ui\Tests;
+namespace Drupal\Tests\views_ui;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/tests/bootstrap.php b/core/tests/bootstrap.php
index 99fe34d..e74dc24 100644
--- a/core/tests/bootstrap.php
+++ b/core/tests/bootstrap.php
@@ -62,7 +62,7 @@ function drupal_phpunit_register_extension_dirs(Composer\Autoload\ClassLoader $l
     }
     if (is_dir($dir . '/tests/src')) {
       // Register the PSR-4 directory for PHPUnit test classes.
-      $loader->addPsr4('Drupal\\' . $extension . '\Tests\\', $dir . '/tests/src');
+      $loader->addPsr4('Drupal\\Tests\\' . $extension . '\\', $dir . '/tests/src');
     }
   }
 }