diff --git a/core/modules/views/src/Tests/TestViewsTest.php b/core/modules/views/tests/src/Kernel/TestViewsTest.php
similarity index 95%
rename from core/modules/views/src/Tests/TestViewsTest.php
rename to core/modules/views/tests/src/Kernel/TestViewsTest.php
index f0d8f8e..8a046043 100644
--- a/core/modules/views/src/Tests/TestViewsTest.php
+++ b/core/modules/views/tests/src/Kernel/TestViewsTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Drupal\views\Tests;
+namespace Drupal\Tests\views\Kernel;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
 use Drupal\config_test\TestInstallStorage;
 use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Config\TypedConfigManager;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\kernelTests\KernelTestBase;
 
 /**
  * Tests that test views provided by all modules match schema.
diff --git a/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php b/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php
index 936bc5f..42c66e0 100644
--- a/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php
@@ -4,14 +4,14 @@
 
 use Drupal\Core\Asset\Exception\InvalidLibrariesExtendSpecificationException;
 use Drupal\Core\Asset\Exception\InvalidLibrariesOverrideSpecificationException;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 /**
  * Tests the library discovery and library discovery parser.
  *
  * @group Render
  */
-class LibraryDiscoveryIntegrationTest extends KernelTestBase {
+class MissingDependentModuleUnitTest extends KernelTestBase {
 
   /**
    * The library discovery service.
diff --git a/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php b/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
index a76fdcf..575071f 100644
--- a/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
+++ b/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Entity\EntityMalformedException;
 use Drupal\Core\Entity\EntityStorageException;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 use Drupal\entity_test\Entity\EntityTestLabel;
 
 /**
diff --git a/core/tests/Drupal/KernelTests/Core/Plugin/Condition/ConditionTestDualUserTest.php b/core/tests/Drupal/KernelTests/Core/Plugin/Condition/ConditionTestDualUserTest.php
index 1e8c311..5d57d57 100644
--- a/core/tests/Drupal/KernelTests/Core/Plugin/Condition/ConditionTestDualUserTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Plugin/Condition/ConditionTestDualUserTest.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Plugin\Context\Context;
 use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 use Drupal\user\Entity\User;
 
 /**
diff --git a/core/tests/Drupal/KernelTests/MissingDependentModuleUnitTest.php b/core/tests/Drupal/KernelTests/MissingDependentModuleUnitTest.php
index a9041f9..7c22d1f 100644
--- a/core/tests/Drupal/KernelTests/MissingDependentModuleUnitTest.php
+++ b/core/tests/Drupal/KernelTests/MissingDependentModuleUnitTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\simpletest\Tests;
 
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 /**
  * This test should not load since it requires a module that is not found.