diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index dda8637..cd0c19e 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -160,7 +160,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    * able to override services from application service providers.
    *
    * Allowing objects is for example used to allow
-   * \Drupal\Tests\KernelTestBase to register itself as service provider.
+   * \Drupal\KernelTests\KernelTestBase to register itself as service provider.
    *
    * @var array
    */
@@ -766,7 +766,7 @@ protected function initializeContainer() {
 
     // If we haven't booted yet but there is a container, then we're asked to
     // boot the container injected via setContainer().
-    // @see \Drupal\Tests\KernelTestBase::setUp()
+    // @see \Drupal\KernelTests\KernelTestBase::setUp()
     if (isset($this->container) && !$this->booted) {
      $container = $this->container;
     }
diff --git a/core/modules/simpletest/src/KernelTestBase.php b/core/modules/simpletest/src/KernelTestBase.php
index 0961e9c..2c8c862 100644
--- a/core/modules/simpletest/src/KernelTestBase.php
+++ b/core/modules/simpletest/src/KernelTestBase.php
@@ -34,7 +34,7 @@
  * module list.
  *
  * @deprecated in Drupal 8.0.x, will be removed before Drupal 8.2.x. Use
- *   \Drupal\Tests\KernelTestBase instead.
+ *   \Drupal\KernelTests\KernelTestBase instead.
  *
  * @see \Drupal\simpletest\KernelTestBase::$modules
  * @see \Drupal\simpletest\KernelTestBase::enableModules()
diff --git a/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php b/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
index c7e0729..3ca3872 100644
--- a/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
+++ b/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use \Drupal\Core\Extension\ModuleUninstallValidatorException;
-use Drupal\Tests\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 /**
  * Tests ModuleHandler functionality.
diff --git a/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php b/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php
index 5f866c0..b05be96 100644
--- a/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php
+++ b/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Site\Settings;
 use Drupal\Core\StreamWrapper\PublicStream;
 use Drupal\system\PhpStorage\MockPhpStorage;
-use Drupal\Tests\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 /**
  * Tests the PHP storage factory.
diff --git a/core/tests/Drupal/Tests/AssertLegacyTrait.php b/core/tests/Drupal/KernelTests/AssertLegacyTrait.php
similarity index 97%
rename from core/tests/Drupal/Tests/AssertLegacyTrait.php
rename to core/tests/Drupal/KernelTests/AssertLegacyTrait.php
index 03e25e7..6165871 100644
--- a/core/tests/Drupal/Tests/AssertLegacyTrait.php
+++ b/core/tests/Drupal/KernelTests/AssertLegacyTrait.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\AssertLegacyTrait.
+ * Contains \Drupal\KernelTests\AssertLegacyTrait.
  */
 
-namespace Drupal\Tests;
+namespace Drupal\KernelTests;
 
 /**
  * Translates Simpletest assertion methods to PHPUnit.
diff --git a/core/tests/Drupal/Tests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
similarity index 99%
rename from core/tests/Drupal/Tests/KernelTestBase.php
rename to core/tests/Drupal/KernelTests/KernelTestBase.php
index 8d5f56d..3e76905 100644
--- a/core/tests/Drupal/Tests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\KernelTestBase.
+ * Contains \Drupal\KernelTests\KernelTestBase.
  */
 
-namespace Drupal\Tests;
+namespace Drupal\KernelTests;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Config\ConfigImporter;
@@ -267,7 +267,7 @@ protected function bootEnvironment() {
       'file_public_path' => $this->siteDirectory . '/files',
       // Disable Twig template caching/dumping.
       'twig_cache' => FALSE,
-      // @see \Drupal\Tests\KernelTestBase::register()
+      // @see \Drupal\KernelTests\KernelTestBase::register()
     );
     new Settings($settings);
 
diff --git a/core/tests/Drupal/KernelTests/KernelTestBaseTest.php b/core/tests/Drupal/KernelTests/KernelTestBaseTest.php
index 5b8d010..2deaa95 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBaseTest.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBaseTest.php
@@ -2,17 +2,16 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\KernelTestBaseTest.
+ * Contains \Drupal\KernelTests\KernelTestBaseTest.
  */
 
 namespace Drupal\KernelTests;
 
-use Drupal\Tests\KernelTestBase;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\visitor\vfsStreamStructureVisitor;
 
 /**
- * @coversDefaultClass \Drupal\Tests\KernelTestBase
+ * @coversDefaultClass \Drupal\KernelTests\KernelTestBase
  * @group PHPUnit
  */
 class KernelTestBaseTest extends KernelTestBase {
diff --git a/core/tests/bootstrap.php b/core/tests/bootstrap.php
index e837a6f..8934525 100644
--- a/core/tests/bootstrap.php
+++ b/core/tests/bootstrap.php
@@ -83,6 +83,7 @@ function drupal_phpunit_get_extension_namespaces($dirs) {
 // Start with classes in known locations.
 $loader = require __DIR__ . '/../../autoload.php';
 $loader->add('Drupal\\Tests', __DIR__);
+$loader->add('Drupal\\KernelTests', __DIR__);
 
 if (!isset($GLOBALS['namespaces'])) {
   // Scan for arbitrary extension namespaces from core and contrib.