diff --git a/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php b/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
similarity index 80%
rename from core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
rename to core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
index 207aa68307d8181ba949e8b67301d2882deee333..1f75bb6eb7c862ee54f6e00b8062495b3d4b25ef 100644
--- a/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
+++ b/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\action\Tests\Migrate\d6\MigrateActionConfigsTest.
+ * Contains \Drupal\Tests\action\Kernel\Migrate\d6\MigrateActionConfigsTest.
  */
 
-namespace Drupal\action\Tests\Migrate\d6;
+namespace Drupal\Tests\action\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to action.settings.yml.
diff --git a/core/modules/action/src/Tests/Migrate/d6/MigrateActionsTest.php b/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionsTest.php
similarity index 93%
rename from core/modules/action/src/Tests/Migrate/d6/MigrateActionsTest.php
rename to core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionsTest.php
index c37a9a771671068a6c7266ce6ece9430600a137a..7addb1e6951b685146d01884dff2ba33997aacbf 100644
--- a/core/modules/action/src/Tests/Migrate/d6/MigrateActionsTest.php
+++ b/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\action\Tests\Migrate\d6\MigrateActionsTest.
+ * Contains \Drupal\Tests\action\Kernel\Migrate\d6\MigrateActionsTest.
  */
 
-namespace Drupal\action\Tests\Migrate\d6;
+namespace Drupal\Tests\action\Kernel\Migrate\d6;
 
 use Drupal\system\Entity\Action;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests migration of action items.
diff --git a/core/modules/action/src/Tests/Migrate/d7/MigrateActionsTest.php b/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionsTest.php
similarity index 93%
rename from core/modules/action/src/Tests/Migrate/d7/MigrateActionsTest.php
rename to core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionsTest.php
index 1d5421901d79b3b505a19d2c77a9898b1e1cfb28..f0ada6c96b434b4293abd176a6094da23c457acf 100644
--- a/core/modules/action/src/Tests/Migrate/d7/MigrateActionsTest.php
+++ b/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\action\Tests\Migrate\d7\MigrateActionsTest.
+ * Contains \Drupal\Tests\action\Kernel\Migrate\d7\MigrateActionsTest.
  */
 
-namespace Drupal\action\Tests\Migrate\d7;
+namespace Drupal\Tests\action\Kernel\Migrate\d7;
 
 use Drupal\system\Entity\Action;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of action items.
diff --git a/core/modules/aggregator/src/Tests/Migrate/MigrateAggregatorStubTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/MigrateAggregatorStubTest.php
similarity index 87%
rename from core/modules/aggregator/src/Tests/Migrate/MigrateAggregatorStubTest.php
rename to core/modules/aggregator/tests/src/Kernel/Migrate/MigrateAggregatorStubTest.php
index d620259a52bdc649e28bc38072851b4c851dfcd2..d448bfd06a69d3051eae700a1d01731742b1249d 100644
--- a/core/modules/aggregator/src/Tests/Migrate/MigrateAggregatorStubTest.php
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/MigrateAggregatorStubTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Tests\Migrate\MigrateAggregatorStubTest.
+ * Contains \Drupal\tests\aggregator\Kernel\Migrate\MigrateAggregatorStubTest.
  */
 
-namespace Drupal\aggregator\Tests\Migrate;
+namespace Drupal\tests\aggregator\Kernel\Migrate;
 
 use Drupal\migrate\MigrateException;
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 use Drupal\migrate_drupal\Tests\StubTestTrait;
 
 /**
diff --git a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorConfigsTest.php
similarity index 86%
rename from core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php
rename to core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorConfigsTest.php
index b9ca05a0fdb03aaa2cc1924a1d0f0fac4cb79838..9d0eadf6c59cba6443444442e88df694a5e8b1d1 100644
--- a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d6\MigrateAggregatorConfigsTest.
+ * Contains \Drupal\Tests\aggregator\Kernel\Migrate\d6\MigrateAggregatorConfigsTest.
  */
 
-namespace Drupal\aggregator\Tests\Migrate\d6;
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to aggregator.settings.yml.
diff --git a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorFeedTest.php
similarity index 87%
rename from core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php
rename to core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorFeedTest.php
index df33d870b915ece723045c7f8a147b2935d514ef..292cc28585c7cd8b91bb9393ec8549fbce130e8e 100644
--- a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorFeedTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d6\MigrateAggregatorFeedTest.
+ * Contains \Drupal\Tests\aggregator\Kernel\Migrate\d6\MigrateAggregatorFeedTest.
  */
 
-namespace Drupal\aggregator\Tests\Migrate\d6;
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d6;
 
 use Drupal\aggregator\Entity\Feed;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests migration of aggregator feeds.
diff --git a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorItemTest.php
similarity index 87%
rename from core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php
rename to core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorItemTest.php
index 90a964bd0cdec9e51a0f861be4072063bb5a2711..4130c4b5d23cb0d72f180bf9a8e45b82e97a9b14 100644
--- a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorItemTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d6\MigrateAggregatorItemTest.
+ * Contains \Drupal\Tests\aggregator\Kernel\Migrate\d6\MigrateAggregatorItemTest.
  */
 
-namespace Drupal\aggregator\Tests\Migrate\d6;
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d6;
 
 use Drupal\aggregator\Entity\Item;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests migration of aggregator items.
diff --git a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorFeedTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorFeedTest.php
similarity index 89%
rename from core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorFeedTest.php
rename to core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorFeedTest.php
index 065476b81f3d5c92a9fb5a0862e44a30ec1acbd5..940161491b21017594f473ead8aa412ab1819274 100644
--- a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorFeedTest.php
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorFeedTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d7\MigrateAggregatorFeedTest.
+ * Contains \Drupal\Tests\aggregator\Kernel\Migrate\d7\MigrateAggregatorFeedTest.
  */
 
-namespace Drupal\aggregator\Tests\Migrate\d7;
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d7;
 
 use Drupal\aggregator\Entity\Feed;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Test migration to aggregator_feed entities.
diff --git a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorItemTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorItemTest.php
similarity index 89%
rename from core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorItemTest.php
rename to core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorItemTest.php
index d0c01541c6e3b1c2a8292c7b10ef1ef23f851e29..9636b7a9f350b113ae36e25fc5612b6a1e3716e8 100644
--- a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorItemTest.php
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorItemTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d7\MigrateAggregatorItemTest.
+ * Contains \Drupal\Tests\aggregator\Kernel\Migrate\d7\MigrateAggregatorItemTest.
  */
 
-namespace Drupal\aggregator\Tests\Migrate\d7;
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d7;
 
 use Drupal\aggregator\Entity\Item;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of aggregator items.
diff --git a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorSettingsTest.php
similarity index 83%
rename from core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php
rename to core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorSettingsTest.php
index 37c77dccb2d7a807a5674848a49f3c551ea7dbcb..24cc160e1b928c0f3dd2e76c80de055278ca4775 100644
--- a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorSettingsTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d7\MigrateAggregatorSettingsTest.
+ * Contains \Drupal\Tests\aggregator\Kernel\Migrate\d7\MigrateAggregatorSettingsTest.
  */
 
-namespace Drupal\aggregator\Tests\Migrate\d7;
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of Aggregator's variables to configuration.
diff --git a/core/modules/ban/src/Tests/Migrate/d7/MigrateBlockedIPsTest.php b/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
similarity index 78%
rename from core/modules/ban/src/Tests/Migrate/d7/MigrateBlockedIPsTest.php
rename to core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
index 6a635fbcce576957ec53f11a22a06fac2529ec00..6b13ab21dd077a2f6d42091c21a1972452c5d3d0 100644
--- a/core/modules/ban/src/Tests/Migrate/d7/MigrateBlockedIPsTest.php
+++ b/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\ban\Tests\Migrate\d7\MigrateBlockedIPsTest.
+ * Contains \Drupal\Tests\ban\Kernel\Migrate\d7\MigrateBlockedIPsTest.
  */
 
-namespace Drupal\ban\Tests\Migrate\d7;
+namespace Drupal\Tests\ban\Kernel\Migrate\d7;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Migrate blocked IPs.
diff --git a/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
similarity index 96%
rename from core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
rename to core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
index 874723f6a019a4a15ba6eb5748bedbfd2c2e024b..b8ea3b934325d95545d8164dc84f53eae4bc81e6 100644
--- a/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
+++ b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\block\Tests\Migrate\d6\MigrateBlockTest.
+ * Contains \Drupal\Tests\block\Kernel\Migrate\d6\MigrateBlockTest.
  */
 
-namespace Drupal\block\Tests\Migrate\d6;
+namespace Drupal\Tests\block\Kernel\Migrate\d6;
 
 use Drupal\block\Entity\Block;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests migration of blocks to configuration entities.
diff --git a/core/modules/block/src/Tests/Migrate/d7/MigrateBlockTest.php b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
similarity index 96%
rename from core/modules/block/src/Tests/Migrate/d7/MigrateBlockTest.php
rename to core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
index f14f3fcf6ac761d25ecbadd29a606a3b2693594d..3d177c4e7b4f4dc4b27a03e12e3a1e1e74854ab0 100644
--- a/core/modules/block/src/Tests/Migrate/d7/MigrateBlockTest.php
+++ b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\block\Tests\Migrate\d7\MigrateBlockTest.
+ * Contains \Drupal\Tests\block\Kernel\Migrate\d7\MigrateBlockTest.
  */
 
-namespace Drupal\block\Tests\Migrate\d7;
+namespace Drupal\Tests\block\Kernel\Migrate\d7;
 
 use Drupal\block\Entity\Block;
 use Drupal\block_content\Entity\BlockContent;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of blocks to configuration entities.
@@ -81,7 +81,6 @@ protected function setUp() {
    *   The block label.
    * @param string $label_display
    *   The block label display setting.
-
    */
   public function assertEntity($id, $plugin_id, array $roles, $pages, $region, $theme, $weight, $label, $label_display) {
     $block = Block::load($id);
diff --git a/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentBodyFieldTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php
similarity index 89%
rename from core/modules/block_content/src/Tests/Migrate/MigrateBlockContentBodyFieldTest.php
rename to core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php
index 159f988e23011c13b817e8af31025c9f32761c7b..ebd0fa1f1c130ea319d93c8e001b899e57782b38 100644
--- a/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentBodyFieldTest.php
+++ b/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php
@@ -2,16 +2,16 @@
 
 /**
  * @file
- * Contains \Drupal\block_content\Tests\Migrate\MigrateBlockContentBodyFieldTest.
+ * Contains \Drupal\Tests\block_content\Kernel\Migrate\MigrateBlockContentBodyFieldTest.
  */
 
-namespace Drupal\block_content\Tests\Migrate;
+namespace Drupal\Tests\block_content\Kernel\Migrate;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\FieldConfigInterface;
 use Drupal\field\FieldStorageConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Attaches a body field to the custom block type.
diff --git a/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentStubTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentStubTest.php
similarity index 87%
rename from core/modules/block_content/src/Tests/Migrate/MigrateBlockContentStubTest.php
rename to core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentStubTest.php
index 5b28c3705fec1e742a45677a1076ce061584cfe6..2f566e182810cc5c7851f7bef70c7c7c3bc2f8e0 100644
--- a/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentStubTest.php
+++ b/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentStubTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\block_content\Tests\Migrate\MigrateBlockContentStubTest.
+ * Contains \Drupal\Tests\block_content\Kernel\Migrate\MigrateBlockContentStubTest.
  */
 
-namespace Drupal\block_content\Tests\Migrate;
+namespace Drupal\Tests\block_content\Kernel\Migrate;
 
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\migrate\MigrateException;
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 use Drupal\migrate_drupal\Tests\StubTestTrait;
 
 /**
diff --git a/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentTypeTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php
similarity index 82%
rename from core/modules/block_content/src/Tests/Migrate/MigrateBlockContentTypeTest.php
rename to core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php
index 19c4039fdb6e0460044c6600541bea5d1dc25c89..b2a99e3422a9198a4d02cd7041d709b791b490e0 100644
--- a/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentTypeTest.php
+++ b/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\block_content\Tests\Migrate\MigrateBlockContentTypeTest.
+ * Contains \Drupal\Tests\block_content\Kernel\Migrate\MigrateBlockContentTypeTest.
  */
 
-namespace Drupal\block_content\Tests\Migrate;
+namespace Drupal\Tests\block_content\Kernel\Migrate;
 
 use Drupal\block_content\BlockContentTypeInterface;
 use Drupal\block_content\Entity\BlockContentType;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of the basic block content type.
diff --git a/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateBlockContentTest.php
similarity index 88%
rename from core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php
rename to core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateBlockContentTest.php
index 3b3098b9140c22ca3547eae6bf5d62de98f878b9..258fd8239194bfeb6c24083fd888aaf312fb8249 100644
--- a/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php
+++ b/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateBlockContentTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\block_content\Tests\Migrate\d6\MigrateBlockContentTest.
+ * Contains \Drupal\Tests\block_content\Kernel\Migrate\d6\MigrateBlockContentTest.
  */
 
-namespace Drupal\block_content\Tests\Migrate\d6;
+namespace Drupal\Tests\block_content\Kernel\Migrate\d6;
 
 use Drupal\block_content\Entity\BlockContent;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade custom blocks.
diff --git a/core/modules/block_content/src/Tests/Migrate/d7/MigrateCustomBlockTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php
similarity index 86%
rename from core/modules/block_content/src/Tests/Migrate/d7/MigrateCustomBlockTest.php
rename to core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php
index b19d2a463a1b8c6a52816d63c8ee7a13bb8f488a..824bad1b04430b4cc6981118f2235c8e19c4e385 100644
--- a/core/modules/block_content/src/Tests/Migrate/d7/MigrateCustomBlockTest.php
+++ b/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\block_content\Tests\Migrate\d7\MigrateCustomBlockTest.
+ * Contains \Drupal\Tests\block_content\Kernel\Migrate\d7\MigrateCustomBlockTest.
  */
 
-namespace Drupal\block_content\Tests\Migrate\d7;
+namespace Drupal\Tests\block_content\Kernel\Migrate\d7;
 
 use Drupal\block_content\BlockContentInterface;
 use Drupal\block_content\Entity\BlockContent;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of custom blocks.
diff --git a/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php b/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php
similarity index 83%
rename from core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
rename to core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php
index 76a8b884c3fa0962a68bdba6f4f84362685461f7..30c4c59050e12f10f1e98a3a09395edf89f91c4b 100644
--- a/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
+++ b/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\book\Tests\Migrate\d6\MigrateBookConfigsTest.
+ * Contains \Drupal\Tests\book\Kernel\Migrate\d6\MigrateBookConfigsTest.
  */
 
-namespace Drupal\book\Tests\Migrate\d6;
+namespace Drupal\Tests\book\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to book.settings.yml.
diff --git a/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php b/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookTest.php
similarity index 91%
rename from core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
rename to core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookTest.php
index da48e860278a336e2b0a0b83efaa8f99b30946a6..ffd033680887634d267e86b462f34b55ff672f8f 100644
--- a/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
+++ b/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\book\Tests\Migrate\d6\MigrateBookTest.
+ * Contains \Drupal\Tests\book\Kernel\Migrate\d6\MigrateBookTest.
  */
 
-namespace Drupal\book\Tests\Migrate\d6;
+namespace Drupal\Tests\book\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\Node;
 
 /**
diff --git a/core/modules/comment/src/Tests/Migrate/MigrateCommentStubTest.php b/core/modules/comment/tests/src/Kernel/Migrate/MigrateCommentStubTest.php
similarity index 90%
rename from core/modules/comment/src/Tests/Migrate/MigrateCommentStubTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/MigrateCommentStubTest.php
index 22818f585a99f88212da8e719d2e6b57414e93a5..33e0b3e46b4ad34d68e1453912a809822379ec2d 100644
--- a/core/modules/comment/src/Tests/Migrate/MigrateCommentStubTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/MigrateCommentStubTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\MigrateCommentStubTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\MigrateCommentStubTest.
  */
 
-namespace Drupal\comment\Tests\Migrate;
+namespace Drupal\Tests\comment\Kernel\Migrate;
 
 use Drupal\comment\Entity\CommentType;
 use Drupal\migrate\MigrateException;
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 use Drupal\migrate_drupal\Tests\StubTestTrait;
 use Drupal\node\Entity\NodeType;
 
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php
similarity index 92%
rename from core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php
index 86f958d8a44062fc7f093fa941848c8c072fef20..69f8de8231a36b8999f14c0b38ce4838b15ebc9b 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d6;
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
 
 use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade comments.
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTypeTest.php
similarity index 82%
rename from core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTypeTest.php
index bedf1323419fed8d7de142001b424849886c93ae..324618a9f743d9712843a32c1467941d1fe950e4 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTypeTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentTypeTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentTypeTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d6;
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
 
 use Drupal\comment\Entity\CommentType;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade comment type.
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableDisplayBase.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableDisplayBase.php
similarity index 73%
rename from core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableDisplayBase.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableDisplayBase.php
index 99977334f44914a877055c9b27b58f6c9121cfff..b399acf10708f8f60bb238fe2c9d0b1cb885992f 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableDisplayBase.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableDisplayBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentVariableDisplayBase.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableDisplayBase.
  */
 
-namespace Drupal\comment\Tests\Migrate\d6;
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Base class for Drupal 6 comment variables to Drupal 8 entity display tests.
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php
similarity index 80%
rename from core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php
index 232654f889bb69a1986161d1df4b15acf99f0eb6..61d346c4993986589b88b37e4542177c6fc04cec 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php
@@ -2,12 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentVariableEntityDisplayTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableEntityDisplayTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d6;
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableDisplayBase;
 
 /**
  * Upgrade comment variables to entity.display.node.*.default.yml.
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
similarity index 83%
rename from core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
index 4875e6a47f67fc5c14f8e9e52de5b7b12c2abcbf..614be7212e33955f7fc9bf03238cd66ec5a98116 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentVariableEntityFormDisplaySubjectTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableEntityFormDisplaySubjectTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d6;
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade comment subject variable to core.entity_form_display.comment.*.default.yml
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php
similarity index 79%
rename from core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php
index e1496d2f8ec0c8b6a612d956e0196b95978fa65e..355c32b7cf524e73f34f68534d95d5043ace2932 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php
@@ -2,12 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentVariableEntityFormDisplayTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableEntityFormDisplayTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d6;
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableDisplayBase;
 
 /**
  * Upgrade comment variables to core.entity_form_display.node.*.default.yml.
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableFieldTest.php
similarity index 78%
rename from core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableFieldTest.php
index e70c9a3a5e64844ecd6555aaa42cbc5203320039..ab6913e1157636acfc89d3fa1f3e3276210841e0 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableFieldTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentVariableFieldTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableFieldTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d6;
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade comment variables to field.storage.node.comment.yml.
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableInstanceTest.php
similarity index 90%
rename from core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableInstanceTest.php
index 7b501255df56ee410c55521e7a3c51ed985def51..4ed90e12113b66d97e00f33ff50dad79d8c4edf6 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableInstanceTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentVariableInstanceTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableInstanceTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d6;
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
 
 use Drupal\comment\CommentManagerInterface;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\Node;
 
 /**
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityDisplayTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityDisplayTest.php
similarity index 89%
rename from core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityDisplayTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityDisplayTest.php
index 14b353601175376c1252090c9e4c5f377c0d5ec5..30d647330ae4fb27e57040d5d01174f66b8b5453 100644
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityDisplayTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityDisplayTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentEntityDisplayTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentEntityDisplayTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d7;
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
 
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of comment display configuration.
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php
similarity index 87%
rename from core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php
index c261ffb4daba246d19e18aa4b503a2bec1bcb083..096058077848d53a7e56cf711a2cbb78b19945cf 100644
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentEntityFormDisplaySubjectTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentEntityFormDisplaySubjectTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d7;
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of comment form's subject display configuration.
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityFormDisplayTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
similarity index 88%
rename from core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
index 2700a4c2949d1d096f348affa42ea3d475b6f263..1353704630032adbb88bfef056e07a3c61d41b5f 100644
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentEntityFormDisplayTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentEntityFormDisplayTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d7;
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of comment form display configuration.
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentFieldInstanceTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldInstanceTest.php
similarity index 94%
rename from core/modules/comment/src/Tests/Migrate/d7/MigrateCommentFieldInstanceTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldInstanceTest.php
index c84621b4e9efbaf9c0f0816c884cfaaf01f579fd..3fdebbd2bf7807006fcfd540326c2398c48924a1 100644
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentFieldInstanceTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldInstanceTest.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentFieldInstanceTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentFieldInstanceTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d7;
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\Core\Field\FieldConfigInterface;
 use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests creation of comment reference fields for each comment type defined
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentFieldTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldTest.php
similarity index 90%
rename from core/modules/comment/src/Tests/Migrate/d7/MigrateCommentFieldTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldTest.php
index bf93f713edeca44b576e2aa55decfc1752facf80..40b8d9950d9f7477ebfe7ceb2fe84e2ea6e5f7d2 100644
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentFieldTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentFieldTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentFieldTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d7;
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\FieldStorageConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests creation of comment reference fields for each comment type defined
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
similarity index 91%
rename from core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
index e0f29fe90fcb528ea7ba7ab10d37908087d8a529..6af6e89f3def9602a17bb8d14f8e8f1b03b755fe 100644
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d7;
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
 
 use Drupal\comment\CommentInterface;
 use Drupal\comment\Entity\Comment;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\node\NodeInterface;
 
 /**
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTypeTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTypeTest.php
similarity index 90%
rename from core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTypeTest.php
rename to core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTypeTest.php
index d7573db7d75383cf5d4c966d0ade63294ca879e1..a1087fe831b9fa31c5423ec934524729612b0d8c 100644
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTypeTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTypeTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentTypeTest.
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentTypeTest.
  */
 
-namespace Drupal\comment\Tests\Migrate\d7;
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
 
 use Drupal\comment\CommentTypeInterface;
 use Drupal\comment\Entity\CommentType;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of comment types from Drupal 7.
diff --git a/core/modules/contact/src/Tests/Migrate/MigrateContactCategoryTest.php b/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php
similarity index 91%
rename from core/modules/contact/src/Tests/Migrate/MigrateContactCategoryTest.php
rename to core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php
index aa9df2dcc21e143c3cdfe8674f2485c001184281..0533d57679dc97762b7aa5fc6fb30cfac4a4bf9a 100644
--- a/core/modules/contact/src/Tests/Migrate/MigrateContactCategoryTest.php
+++ b/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\contact\Tests\Migrate\MigrateContactCategoryTest.
+ * Contains \Drupal\Tests\contact\Kernel\Migrate\MigrateContactCategoryTest.
  */
 
-namespace Drupal\contact\Tests\Migrate;
+namespace Drupal\Tests\contact\Kernel\Migrate;
 
 use Drupal\contact\Entity\ContactForm;
 use Drupal\contact\ContactFormInterface;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate contact categories to contact.form.*.yml.
diff --git a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php b/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactCategoryTest.php
similarity index 89%
rename from core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
rename to core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactCategoryTest.php
index 6ea9c66c780c910cbe31724441847851b336bea2..84377a207404fd773264437b1d9ceba115726e9d 100644
--- a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
+++ b/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactCategoryTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\contact\Tests\Migrate\d6\MigrateContactCategoryTest.
+ * Contains \Drupal\Tests\contact\Kernel\Migrate\d6\MigrateContactCategoryTest.
  */
 
-namespace Drupal\contact\Tests\Migrate\d6;
+namespace Drupal\Tests\contact\Kernel\Migrate\d6;
 
 use Drupal\contact\Entity\ContactForm;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate contact categories to contact.form.*.yml.
diff --git a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactSettingsTest.php b/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactSettingsTest.php
similarity index 83%
rename from core/modules/contact/src/Tests/Migrate/d6/MigrateContactSettingsTest.php
rename to core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactSettingsTest.php
index ef394230870f13c39eed90685e38814b10890cb2..65d9826cce0af0a8b1cb5eb6f9179dc7ad84ac30 100644
--- a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactSettingsTest.php
+++ b/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactSettingsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\contact\Tests\Migrate\d6\MigrateContactSettingsTest.
+ * Contains \Drupal\Tests\contact\Kernel\Migrate\d6\MigrateContactSettingsTest.
  */
 
-namespace Drupal\contact\Tests\Migrate\d6;
+namespace Drupal\Tests\contact\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to contact.settings.yml.
diff --git a/core/modules/contact/src/Tests/Migrate/d7/MigrateContactSettingsTest.php b/core/modules/contact/tests/src/Kernel/Migrate/d7/MigrateContactSettingsTest.php
similarity index 80%
rename from core/modules/contact/src/Tests/Migrate/d7/MigrateContactSettingsTest.php
rename to core/modules/contact/tests/src/Kernel/Migrate/d7/MigrateContactSettingsTest.php
index bc530bb83c32f41b8f97775e1eb74c342feb2cf1..7f8ddd2057cbf64aa0f20064479f92a812dbf7cf 100644
--- a/core/modules/contact/src/Tests/Migrate/d7/MigrateContactSettingsTest.php
+++ b/core/modules/contact/tests/src/Kernel/Migrate/d7/MigrateContactSettingsTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\contact\Tests\Migrate\d7\MigrateContactSettingsTest.
+ * Contains \Drupal\Tests\contact\Kernel\Migrate\d7\MigrateContactSettingsTest.
  */
 
-namespace Drupal\contact\Tests\Migrate\d7;
+namespace Drupal\Tests\contact\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of Contact settings to configuration.
diff --git a/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php b/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php
similarity index 80%
rename from core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php
rename to core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php
index fc998598e5479e75a92c0a185d15fe393d75c02c..f391cff3fb61aace57d238f34055e58e8bb9da17 100644
--- a/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php
+++ b/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\dblog\Tests\Migrate\d6\MigrateDblogConfigsTest.
+ * Contains \Drupal\Tests\dblog\Kernel\Migrate\d6\MigrateDblogConfigsTest.
  */
 
-namespace Drupal\dblog\Tests\Migrate\d6;
+namespace Drupal\Tests\dblog\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to dblog.settings.yml.
diff --git a/core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php b/core/modules/dblog/tests/src/Kernel/Migrate/d7/MigrateDblogConfigsTest.php
similarity index 77%
rename from core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php
rename to core/modules/dblog/tests/src/Kernel/Migrate/d7/MigrateDblogConfigsTest.php
index b29832bbf1350944c8dc00594caa181abf601a43..dc6223f6329d2cb7313bd2c701f237f2f8a5664b 100644
--- a/core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php
+++ b/core/modules/dblog/tests/src/Kernel/Migrate/d7/MigrateDblogConfigsTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\dblog\Tests\Migrate\d7\MigrateDblogConfigsTest.
+ * Contains \Drupal\Tests\dblog\Kernel\Migrate\d7\MigrateDblogConfigsTest.
  */
 
-namespace Drupal\dblog\Tests\Migrate\d7;
+namespace Drupal\Tests\dblog\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Upgrade variables to dblog.settings.yml.
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
similarity index 97%
rename from core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php
rename to core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
index 7566c7023c2bdf84d8f8cf390c5e5982d15bd832..9957da44f12bb647905de27e8dcf797e64a44b77 100644
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Migrate\d6\MigrateFieldFormatterSettingsTest.
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d6\MigrateFieldFormatterSettingsTest.
  */
 
-namespace Drupal\field\Tests\Migrate\d6;
+namespace Drupal\Tests\field\Kernel\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade field formatter settings to entity.display.*.*.yml.
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php
similarity index 95%
rename from core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php
rename to core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php
index 2abd9408acef0d85c79b5c5599b3f1b9b8e84cf6..dc910e17813fc406cdf3a250d8f28d938bf2d8c8 100644
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Migrate\d6\MigrateFieldInstanceTest.
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d6\MigrateFieldInstanceTest.
  */
 
-namespace Drupal\field\Tests\Migrate\d6;
+namespace Drupal\Tests\field\Kernel\Migrate\d6;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\link\LinkItemInterface;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\Node;
 
 /**
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php
similarity index 97%
rename from core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php
rename to core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php
index b43da7f3ed15e8e2f6846818f8c5e5b30ab21d38..49c3ea867d25a56b12a70a5e33bf928313d8d4ef 100644
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Migrate\d6\MigrateFieldTest.
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d6\MigrateFieldTest.
  */
 
-namespace Drupal\field\Tests\Migrate\d6;
+namespace Drupal\Tests\field\Kernel\Migrate\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate fields.
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
similarity index 94%
rename from core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php
rename to core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
index 8a4140ec2cd24be7abbefa1a61217eac3a0bc8ee..5c37d64f1dbd770917d72c3755f003418a2078e0 100644
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Migrate\d6\MigrateFieldWidgetSettingsTest.
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d6\MigrateFieldWidgetSettingsTest.
  */
 
-namespace Drupal\field\Tests\Migrate\d6;
+namespace Drupal\Tests\field\Kernel\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate field widget settings.
diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldFormatterSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
similarity index 98%
rename from core/modules/field/src/Tests/Migrate/d7/MigrateFieldFormatterSettingsTest.php
rename to core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
index 246b1e5ffa612988dbbfb4631a2acca9e0d31d65..4f3147c58414b5ad6add8d8838782e7dd9592191 100644
--- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldFormatterSettingsTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
@@ -2,16 +2,16 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Migrate\d7\MigrateFieldFormatterSettingsTest.
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d7\MigrateFieldFormatterSettingsTest.
  */
 
-namespace Drupal\field\Tests\Migrate\d7;
+namespace Drupal\Tests\field\Kernel\Migrate\d7;
 
 use Drupal\comment\Entity\CommentType;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\node\Entity\NodeType;
 
 /**
diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php
similarity index 96%
rename from core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceTest.php
rename to core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php
index 3bf5d899123cfe076abc9401846cd2dc9ad71fa8..e8377d8c6677ff73904d3cca17016f7733cc2845 100644
--- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Migrate\d7\MigrateFieldInstanceTest.
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d7\MigrateFieldInstanceTest.
  */
 
-namespace Drupal\field\Tests\Migrate\d7;
+namespace Drupal\Tests\field\Kernel\Migrate\d7;
 
 use Drupal\comment\Entity\CommentType;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\FieldConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\node\Entity\NodeType;
 
 /**
diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
similarity index 96%
rename from core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
rename to core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
index f6dbd465cacbfdfc44458a41b2f3387d0140dab6..061fb60ba1d3ad70a367244903b962d0fe0b72d6 100644
--- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Migrate\d7\MigrateFieldInstanceWidgetSettingsTest.
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d7\MigrateFieldInstanceWidgetSettingsTest.
  */
 
-namespace Drupal\field\Tests\Migrate\d7;
+namespace Drupal\Tests\field\Kernel\Migrate\d7;
 
 use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Migrate field widget settings.
diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldTest.php
similarity index 96%
rename from core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php
rename to core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldTest.php
index 6379ce336cb8ba4572a3a4732778e24e2743cde4..4b0d1f90da7b7ff22717510bc0b885cea484486d 100644
--- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Migrate\d7\MigrateFieldTest.
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d7\MigrateFieldTest.
  */
 
-namespace Drupal\field\Tests\Migrate\d7;
+namespace Drupal\Tests\field\Kernel\Migrate\d7;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\FieldStorageConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Migrates Drupal 7 fields.
diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateViewModesTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php
similarity index 89%
rename from core/modules/field/src/Tests/Migrate/d7/MigrateViewModesTest.php
rename to core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php
index 04062a7b430a1e6d6c315e5290c3e558a6bc6224..303d859ac7e79c436393a52df6a1f445b90d9bd4 100644
--- a/core/modules/field/src/Tests/Migrate/d7/MigrateViewModesTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Migrate\d7\MigrateViewModesTest.
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d7\MigrateViewModesTest.
  */
 
-namespace Drupal\field\Tests\Migrate\d7;
+namespace Drupal\Tests\field\Kernel\Migrate\d7;
 
 use Drupal\Core\Entity\Entity\EntityViewMode;
 use Drupal\Core\Entity\EntityViewModeInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of D7 view modes.
diff --git a/core/modules/file/src/Tests/Migrate/EntityFileTest.php b/core/modules/file/tests/src/Kernel/Migrate/EntityFileTest.php
similarity index 85%
rename from core/modules/file/src/Tests/Migrate/EntityFileTest.php
rename to core/modules/file/tests/src/Kernel/Migrate/EntityFileTest.php
index 3c5b8ad25e8631bfddbf2b7cc1bd641609bd4ad9..08e9fcb29677f03443ac693d52bfc38f637c9a7a 100644
--- a/core/modules/file/src/Tests/Migrate/EntityFileTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/EntityFileTest.php
@@ -2,18 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\file\Tests\Migrate\EntityFileTest.
+ * Contains \Drupal\Tests\file\Kernel\Migrate\EntityFileTest.
  */
 
-namespace Drupal\file\Tests\Migrate;
+namespace Drupal\Tests\file\Kernel\Migrate;
 
-use Drupal\Core\Site\Settings;
+use Drupal\Core\StreamWrapper\StreamWrapperInterface;
 use Drupal\migrate\Row;
 use Drupal\file\Plugin\migrate\destination\EntityFile;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\migrate\MigrateException;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 /**
  * Tests the entity file destination plugin.
@@ -30,7 +30,7 @@ class EntityFileTest extends KernelTestBase {
   public static $modules = array('system', 'entity_test', 'user', 'file');
 
   /**
-   * @var \Drupal\file\Tests\Migrate\TestEntityFile $destination
+   * @var \Drupal\Tests\file\Kernel\Migrate\TestEntityFile $destination
    */
   protected $destination;
 
@@ -39,9 +39,8 @@ class EntityFileTest extends KernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
+    \Drupal::getContainer()->get('stream_wrapper_manager')->registerWrapper('public', 'Drupal\Core\StreamWrapper\PublicStream', StreamWrapperInterface::NORMAL);
     $this->destination = new TestEntityFile([]);
-    $this->destination->streamWrapperManager = \Drupal::getContainer()->get('stream_wrapper_manager');
-    $this->destination->fileSystem = \Drupal::getContainer()->get('file_system');
     $this->installEntitySchema('file');
 
     file_put_contents('/tmp/test-file.jpg', '');
@@ -67,18 +66,17 @@ public function testSuccessfulCopies() {
    *   An array of file permutations to test.
    */
   protected function localFileDataProvider() {
-    global $base_url;
     return [
       // Test a local to local copy.
-      [['filepath' => 'core/modules/simpletest/files/image-test.jpg'], 'public://file1.jpg', TRUE, DRUPAL_ROOT . '/'],
+      [['filepath' => 'core/modules/simpletest/files/image-test.jpg'], 'public://file1.jpg', TRUE, $this->root . '/'],
       // Test a temporary file using an absolute path.
       [['filepath' => '/tmp/test-file.jpg'], 'temporary://test.jpg', TRUE, ''],
       // Test a temporary file using a relative path.
       [['filepath' => 'test-file.jpg'], 'temporary://core/modules/simpletest/files/test.jpg', TRUE, '/tmp/'],
       // Test a remote path to local.
-      [['filepath' => 'core/modules/simpletest/files/image-test.jpg'], 'public://remote-file.jpg', TRUE, $base_url . '/'],
+      [['filepath' => 'core/modules/simpletest/files/image-test.jpg'], 'public://remote-file.jpg', TRUE, $this->root . '/'],
       // Test a remote path to local inside a folder that doesn't exist.
-      [['filepath' => 'core/modules/simpletest/files/image-test.jpg'], 'public://folder/remote-file.jpg', TRUE, DRUPAL_ROOT . '/'],
+      [['filepath' => 'core/modules/simpletest/files/image-test.jpg'], 'public://folder/remote-file.jpg', TRUE, $this->root . '/'],
     ];
   }
 
@@ -164,11 +162,11 @@ public function testGetDirectory() {
     $method = new \ReflectionMethod($plugin, 'getDirectory');
     $method->setAccessible(TRUE);
 
-    $this->assertEqual('public://foo', $method->invoke($plugin, 'public://foo/baz.txt'));
-    $this->assertEqual('/path/to', $method->invoke($plugin, '/path/to/foo.txt'));
+    $this->assertSame('public://foo', $method->invoke($plugin, 'public://foo/baz.txt'));
+    $this->assertSame('/path/to', $method->invoke($plugin, '/path/to/foo.txt'));
     // A directory like public:// (no path) needs to resolve to a physical path.
     $fs = \Drupal::getContainer()->get('file_system');
-    $this->assertEqual($fs->realpath(Settings::get('file_public_path')), $method->invoke($plugin, 'public://foo.txt'));
+    $this->assertSame($fs->realpath('public://'), $method->invoke($plugin, 'public://foo.txt'));
   }
 
   /**
@@ -179,13 +177,6 @@ public function testIsLocationUnchanged() {
     $method = new \ReflectionMethod($plugin, 'isLocationUnchanged');
     $method->setAccessible(TRUE);
 
-    $public_dir = Settings::get('file_public_path');
-
-    // Due to the limitations of realpath(), the source file must exist.
-    touch('public://foo.txt');
-    $this->assertTrue($method->invoke($plugin, $public_dir . '/foo.txt', 'public://foo.txt'));
-    unlink('public://foo.txt');
-
     $temporary_file = '/tmp/foo.txt';
     touch($temporary_file);
     $this->assertTrue($method->invoke($plugin, $temporary_file, 'temporary://foo.txt'));
@@ -257,17 +248,7 @@ class TestEntityFile extends EntityFile {
    */
   public $storage;
 
-  /**
-   * @var \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface
-   */
-  public $streamWrapperManager;
-
-  /**
-   * @var \Drupal\Core\File\FileSystemInterface
-   */
-  public $fileSystem;
-
-  public function __construct($configuration) {
+  public function __construct($configuration = []) {
     $configuration +=  array(
       'source_base_path' => '',
       'source_path_property' => 'filepath',
@@ -278,6 +259,8 @@ public function __construct($configuration) {
     $this->configuration = $configuration;
     // We need a mock entity to be passed to save to prevent strict exceptions.
     $this->mockEntity = EntityTest::create();
+    $this->streamWrapperManager = \Drupal::getContainer()->get('stream_wrapper_manager');
+    $this->fileSystem = \Drupal::getContainer()->get('file_system');
   }
 
   /**
diff --git a/core/modules/file/src/Tests/Migrate/MigrateFileStubTest.php b/core/modules/file/tests/src/Kernel/Migrate/MigrateFileStubTest.php
similarity index 75%
rename from core/modules/file/src/Tests/Migrate/MigrateFileStubTest.php
rename to core/modules/file/tests/src/Kernel/Migrate/MigrateFileStubTest.php
index ae7446c877a22aa5c53b5d0d519ebbe422f03b01..71a6875643bde68aa6ae8af0ef6942aa6ec9ce86 100644
--- a/core/modules/file/src/Tests/Migrate/MigrateFileStubTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/MigrateFileStubTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\file\Tests\Migrate\MigrateFileStubTest.
+ * Contains \Drupal\Tests\file\Kernel\Migrate\MigrateFileStubTest.
  */
 
-namespace Drupal\file\Tests\Migrate;
+namespace Drupal\Tests\file\Kernel\Migrate;
 
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 use Drupal\migrate_drupal\Tests\StubTestTrait;
 
 /**
diff --git a/core/modules/file/src/Tests/Migrate/d6/FileMigrationTestTrait.php b/core/modules/file/tests/src/Kernel/Migrate/d6/FileMigrationTestTrait.php
similarity index 86%
rename from core/modules/file/src/Tests/Migrate/d6/FileMigrationTestTrait.php
rename to core/modules/file/tests/src/Kernel/Migrate/d6/FileMigrationTestTrait.php
index 9bb16936c548a86a5727b319284a4c7757cba232..43d408887dbe20e1f43c4c14edf5c1a88f94ae11 100644
--- a/core/modules/file/src/Tests/Migrate/d6/FileMigrationTestTrait.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/FileMigrationTestTrait.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\file\Tests\Migrate\d6\FileMigrationTestTrait.
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\FileMigrationTestTrait.
  */
 
-namespace Drupal\file\Tests\Migrate\d6;
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
 
 /**
  * Helper for setting up a file migration test.
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php
similarity index 82%
rename from core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php
rename to core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php
index e7fef74319e0d4920fbc554876911f81f63f484a..dced9e20f338c790494d4aa3af6c00c27b24c2de 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateFileConfigsTest.
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateFileConfigsTest.
  */
 
-namespace Drupal\file\Tests\Migrate\d6;
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to file.settings.yml.
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
similarity index 90%
rename from core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php
rename to core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
index 5c416e40469309a73dabdba8b9b0f2732f031dab..6b7c687e71804c9fcdbb8cf31cf39a72796ef714 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
@@ -2,18 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateFileTest.
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateFileTest.
  */
 
-namespace Drupal\file\Tests\Migrate\d6;
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
 
 use Drupal\Component\Utility\Random;
 use Drupal\file\Entity\File;
 use Drupal\file\FileInterface;
-use Drupal\migrate\Tests\MigrateDumpAlterInterface;
+use Drupal\KernelTests\KernelTestBase;
 use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\simpletest\TestBase;
+use Drupal\Tests\migrate\Kernel\MigrateDumpAlterInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * file migration.
@@ -90,7 +90,7 @@ public function testFiles() {
       ->execute();
     Database::getConnection('default', 'migrate')
       ->update('variable')
-      ->fields(array('value' => serialize($this->getTempFilesDirectory())))
+      ->fields(array('value' => serialize(file_directory_temp())))
       ->condition('name', 'file_directory_temp')
       ->execute();
 
@@ -120,10 +120,10 @@ public static function getUniqueFilename() {
   /**
    * {@inheritdoc}
    */
-  public static function migrateDumpAlter(TestBase $test) {
+  public static function migrateDumpAlter(KernelTestBase $test) {
     // Creates a random filename and updates the source database.
     $random = new Random();
-    $temp_directory = $test->getTempFilesDirectory();
+    $temp_directory = file_directory_temp();
     file_prepare_directory($temp_directory, FILE_CREATE_DIRECTORY);
     static::$tempFilename = $test->getDatabasePrefix() . $random->name() . '.jpg';
     $file_path = $temp_directory . '/' . static::$tempFilename;
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
similarity index 86%
rename from core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php
rename to core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
index a3079658f8a613a1894645cdb2577bcae5a3ed42..a50b2d90bfbb1cd43d9a9d51ba259b60d9b862bf 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadEntityDisplayTest.
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateUploadEntityDisplayTest.
  */
 
-namespace Drupal\file\Tests\Migrate\d6;
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upload entity display.
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
similarity index 86%
rename from core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
rename to core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
index 78555f1a604a5248795bd9cc6186e3964a1560ce..688e6ca01d4f65b8fab72d80a1081a9e0f2c938d 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadEntityFormDisplayTest.
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateUploadEntityFormDisplayTest.
  */
 
-namespace Drupal\file\Tests\Migrate\d6;
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upload form entity display.
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadFieldTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadFieldTest.php
similarity index 78%
rename from core/modules/file/src/Tests/Migrate/d6/MigrateUploadFieldTest.php
rename to core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadFieldTest.php
index 4a5df83fe03928ce804c5a52267cf0ae302fff43..f7531dcbb4f759ebdbd2866449c9409e38703ab1 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadFieldTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadFieldTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadFieldTest.
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateUploadFieldTest.
  */
 
-namespace Drupal\file\Tests\Migrate\d6;
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Uploads migration.
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
similarity index 86%
rename from core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php
rename to core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
index 3e30ed75f10526f2dbccc521312726a7690fa8e3..9b1238c0ed86db7c005a622f17eb6dce38d180ea 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadInstanceTest.
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateUploadInstanceTest.
  */
 
-namespace Drupal\file\Tests\Migrate\d6;
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upload field instance migration.
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php
similarity index 93%
rename from core/modules/file/src/Tests/Migrate/d6/MigrateUploadTest.php
rename to core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php
index 08b5ef1cccf071240ef4e6fcf4d707566f75e605..b676f61514776f6cb9e05cb3830725457180183f 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadTest.
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateUploadTest.
  */
 
-namespace Drupal\file\Tests\Migrate\d6;
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
 
 use Drupal\file\Entity\File;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\Node;
 
 /**
diff --git a/core/modules/file/src/Tests/Migrate/d7/MigrateFileTest.php b/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileTest.php
similarity index 86%
rename from core/modules/file/src/Tests/Migrate/d7/MigrateFileTest.php
rename to core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileTest.php
index 9e7108355f90c83a29e0d63b164de87d0250d55a..4860dab33c5b6044a3e7eb1fd81444cd68ac2629 100644
--- a/core/modules/file/src/Tests/Migrate/d7/MigrateFileTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileTest.php
@@ -2,14 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\file\Tests\Migrate\d7\MigrateFileTest.
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d7\MigrateFileTest.
  */
 
-namespace Drupal\file\Tests\Migrate\d7;
+namespace Drupal\Tests\file\Kernel\Migrate\d7;
 
+use Drupal\Core\StreamWrapper\StreamWrapperInterface;
 use Drupal\file\Entity\File;
 use Drupal\file\FileInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Migrates all files in the file_managed table.
@@ -27,6 +28,7 @@ protected function setUp() {
     parent::setUp();
 
     $this->installEntitySchema('file');
+    $this->container->get('stream_wrapper_manager')->registerWrapper('public', 'Drupal\Core\StreamWrapper\PublicStream', StreamWrapperInterface::NORMAL);
 
     $fs = \Drupal::service('file_system');
     // The public file directory active during the test will serve as the
@@ -42,7 +44,7 @@ protected function setUp() {
       'plugin' => 'entity:file',
       // Note that source_base_path must include a trailing slash because it's
       // prepended directly to the value of the source path property.
-      'source_base_path' => $fs->realpath($this->publicFilesDirectory) . '/',
+      'source_base_path' => $fs->realpath('public://') . '/',
       // This is set in the migration's YAML file, but we need to repeat it
       // here because all the destination configuration must be set at once.
       'source_path_property' => 'filepath',
diff --git a/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php b/core/modules/filter/tests/src/Kernel/Migrate/d6/MigrateFilterFormatTest.php
similarity index 90%
rename from core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php
rename to core/modules/filter/tests/src/Kernel/Migrate/d6/MigrateFilterFormatTest.php
index 2a3de4eba835a7bac3417e1f56f0f56d359817aa..d4e5cd3ea50d793aa73ccf9fa6d0f03ee1f505d2 100644
--- a/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php
+++ b/core/modules/filter/tests/src/Kernel/Migrate/d6/MigrateFilterFormatTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\filter\Tests\Migrate\d6\MigrateFilterFormatTest.
+ * Contains \Drupal\Tests\filter\Kernel\Migrate\d6\MigrateFilterFormatTest.
  */
 
-namespace Drupal\filter\Tests\Migrate\d6;
+namespace Drupal\Tests\filter\Kernel\Migrate\d6;
 
 use Drupal\filter\Entity\FilterFormat;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to filter.formats.*.yml.
diff --git a/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php b/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php
similarity index 93%
rename from core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php
rename to core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php
index b96b99a2e46e5a60707a6fa80e8fafa682e26d23..4bbacdb514a2508ffcec8d234d7e85b3a5fcd294 100644
--- a/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php
+++ b/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\filter\Tests\Migrate\d7\MigrateFilterFormatTest.
+ * Contains \Drupal\Tests\filter\Kernel\Migrate\d7\MigrateFilterFormatTest.
  */
 
-namespace Drupal\filter\Tests\Migrate\d7;
+namespace Drupal\Tests\filter\Kernel\Migrate\d7;
 
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\filter\FilterFormatInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Upgrade variables to filter.formats.*.yml.
diff --git a/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php b/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php
similarity index 87%
rename from core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php
rename to core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php
index 42e797ddf9d37fbe62dca27bd1db4d2b268742b7..dcbd5f79c2ec686e37ac7422c3a7092b66d87f34 100644
--- a/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php
+++ b/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\forum\Tests\Migrate\d6\MigrateForumConfigsTest.
+ * Contains \Drupal\Tests\forum\Kernel\Migrate\d6\MigrateForumConfigsTest.
  */
 
-namespace Drupal\forum\Tests\Migrate\d6;
+namespace Drupal\Tests\forum\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to forum.settings.yml.
diff --git a/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php b/core/modules/forum/tests/src/Kernel/Migrate/d7/MigrateForumSettingsTest.php
similarity index 85%
rename from core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php
rename to core/modules/forum/tests/src/Kernel/Migrate/d7/MigrateForumSettingsTest.php
index f702b9a9e7ed77b8ea40d31c90361d51c43d9125..6305da3d420e8d54029f09f14b8ade2fe080541a 100644
--- a/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php
+++ b/core/modules/forum/tests/src/Kernel/Migrate/d7/MigrateForumSettingsTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\forum\Tests\Migrate\d7\MigrateForumSettingsTest.
+ * Contains \Drupal\Tests\forum\Kernel\Migrate\d7\MigrateForumSettingsTest.
  */
 
-namespace Drupal\forum\Tests\Migrate\d7;
+namespace Drupal\Tests\forum\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of Forum's variables to configuration.
diff --git a/core/modules/image/src/Tests/Migrate/d6/MigrateImageCacheTest.php b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
similarity index 96%
rename from core/modules/image/src/Tests/Migrate/d6/MigrateImageCacheTest.php
rename to core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
index 368d0f12556be0ae5ca8b0727f77b20b6add7ee6..b8b40f800bc9231bac3ffdbd92a882de11db5027 100644
--- a/core/modules/image/src/Tests/Migrate/d6/MigrateImageCacheTest.php
+++ b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
@@ -2,16 +2,16 @@
 
 /**
  * @file
- * Contains \Drupal\image\Tests\Migrate\d6\MigrateImageCacheTest.
+ * Contains \Drupal\Tests\image\Kernel\Migrate\d6\MigrateImageCacheTest.
  */
 
-namespace Drupal\image\Tests\Migrate\d6;
+namespace Drupal\Tests\image\Kernel\Migrate\d6;
 
 use Drupal\Core\Database\Database;
 use Drupal\image\Entity\ImageStyle;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests migration of ImageCache presets to image styles.
diff --git a/core/modules/image/src/Tests/Migrate/d7/MigrateImageSettingsTest.php b/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageSettingsTest.php
similarity index 79%
rename from core/modules/image/src/Tests/Migrate/d7/MigrateImageSettingsTest.php
rename to core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageSettingsTest.php
index f1933da51d3545a0be082a0c3bf20478563f4d30..1a30b6ae8a5c5c1c2c8a166779bab2a5ed10b228 100644
--- a/core/modules/image/src/Tests/Migrate/d7/MigrateImageSettingsTest.php
+++ b/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageSettingsTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\image\Tests\Migrate\d7\MigrateImageSettingsTest.
+ * Contains \Drupal\Tests\image\Kernel\Migrate\d7\MigrateImageSettingsTest.
  */
 
-namespace Drupal\image\Tests\Migrate\d7;
+namespace Drupal\Tests\image\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of Image variables to configuration.
diff --git a/core/modules/image/src/Tests/Migrate/d7/MigrateImageStylesTest.php b/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php
similarity index 93%
rename from core/modules/image/src/Tests/Migrate/d7/MigrateImageStylesTest.php
rename to core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php
index a4d11ce5036cbe85e79412727d518750958c4f56..1ded5dd0e244bf1ad0761be2f10e344a26ff41ab 100644
--- a/core/modules/image/src/Tests/Migrate/d7/MigrateImageStylesTest.php
+++ b/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\image\Tests\Migrate\d7\MigrateImageStylesTest.
+ * Contains \Drupal\Tests\image\Kernel\Migrate\d7\MigrateImageStylesTest.
  */
 
-namespace Drupal\image\Tests\Migrate\d7;
+namespace Drupal\Tests\image\Kernel\Migrate\d7;
 
 use Drupal\image\Entity\ImageStyle;
 use Drupal\image\ImageStyleInterface;
 use Drupal\image\ImageEffectBase;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Test image styles migration to config entities.
diff --git a/core/modules/language/src/Tests/Migrate/MigrateLanguageTest.php b/core/modules/language/src/Tests/Migrate/MigrateLanguageTest.php
index 7b225ae2e7a2f2e4912b99403cae1e3cb1f4d5c7..9706d7147a113f710f4e9679ea86b4cb4facf292 100644
--- a/core/modules/language/src/Tests/Migrate/MigrateLanguageTest.php
+++ b/core/modules/language/src/Tests/Migrate/MigrateLanguageTest.php
@@ -9,7 +9,7 @@
 
 use Drupal\language\ConfigurableLanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * @group migrate_drupal_6
diff --git a/core/modules/language/src/Tests/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php b/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
similarity index 78%
rename from core/modules/language/src/Tests/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
rename to core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
index 242d818b4e55efddd1d060c70efb77afed8f94aa..38d545f541e3cb8cd70f7063b48f19ae5aad4cd2 100644
--- a/core/modules/language/src/Tests/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
+++ b/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\language\Tests\Migrate\d7\MigrateLanguageNegotiationSettingsTest.
+ * Contains \Drupal\Tests\language\Kernel\Migrate\d7\MigrateLanguageNegotiationSettingsTest.
  */
 
-namespace Drupal\language\Tests\Migrate\d7;
+namespace Drupal\Tests\language\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of language negotiation variables.
diff --git a/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php b/core/modules/locale/tests/src/Kernel/Migrate/MigrateLocaleConfigsTest.php
similarity index 82%
rename from core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php
rename to core/modules/locale/tests/src/Kernel/Migrate/MigrateLocaleConfigsTest.php
index bdf144a7a9e5f2345ce5be9684b889e7c9d783c9..df3513ad981557beeabd4e785caf5bc1c208f450 100644
--- a/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php
+++ b/core/modules/locale/tests/src/Kernel/Migrate/MigrateLocaleConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\locale\Tests\Migrate\MigrateLocaleConfigsTest.
+ * Contains \Drupal\Tests\locale\Kernel\Migrate\MigrateLocaleConfigsTest.
  */
 
-namespace Drupal\locale\Tests\Migrate;
+namespace Drupal\Tests\locale\Kernel\Migrate;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to locale.settings.yml.
diff --git a/core/modules/menu_link_content/src/Tests/Migrate/MigrateMenuLinkContentStubTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/MigrateMenuLinkContentStubTest.php
similarity index 75%
rename from core/modules/menu_link_content/src/Tests/Migrate/MigrateMenuLinkContentStubTest.php
rename to core/modules/menu_link_content/tests/src/Kernel/Migrate/MigrateMenuLinkContentStubTest.php
index 47e94d13409ad58141bb439d5827d82297c3162c..5736bd9564e3f7aca072f67bc23f5d50fc6cbf38 100644
--- a/core/modules/menu_link_content/src/Tests/Migrate/MigrateMenuLinkContentStubTest.php
+++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/MigrateMenuLinkContentStubTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\menu_link_content\Tests\Migrate\MigrateMenuLinkContentStubTest.
+ * Contains \Drupal\Tests\menu_link_content\Kernel\Migrate\MigrateMenuLinkContentStubTest.
  */
 
-namespace Drupal\menu_link_content\Tests\Migrate;
+namespace Drupal\Tests\menu_link_content\Kernel\Migrate;
 
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 use Drupal\migrate_drupal\Tests\StubTestTrait;
 
 /**
diff --git a/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
similarity index 93%
rename from core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php
rename to core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
index 495b6f0a4ad08a832bce6ee60d9fe59cc0b37ae5..f043850490816f01af09e2000c9d564ebfb1cc55 100644
--- a/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php
+++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\menu_link_content\Tests\Migrate\d6\MigrateMenuLinkTest.
+ * Contains \Drupal\Tests\menu_link_content\Kernel\Migrate\d6\MigrateMenuLinkTest.
  */
 
-namespace Drupal\menu_link_content\Tests\Migrate\d6;
+namespace Drupal\Tests\menu_link_content\Kernel\Migrate\d6;
 
 use Drupal\menu_link_content\Entity\MenuLinkContent;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Menu link migration.
diff --git a/core/modules/menu_link_content/src/Tests/Migrate/d7/MigrateMenuLinkTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
similarity index 95%
rename from core/modules/menu_link_content/src/Tests/Migrate/d7/MigrateMenuLinkTest.php
rename to core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
index 5664dda39105862f775540727763eca07d3e8cd5..2c3aef835362ecf5b18305528d4eb4258de9fc0b 100644
--- a/core/modules/menu_link_content/src/Tests/Migrate/d7/MigrateMenuLinkTest.php
+++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
@@ -2,16 +2,16 @@
 
 /**
  * @file
- * Contains \Drupal\menu_link_content\Tests\Migrate\d7\MigrateMenuLinkTest.
+ * Contains \Drupal\Tests\menu_link_content\Kernel\Migrate\d7\MigrateMenuLinkTest.
  */
 
-namespace Drupal\menu_link_content\Tests\Migrate\d7;
+namespace Drupal\Tests\menu_link_content\Kernel\Migrate\d7;
 
 use Drupal\Core\Database\Database;
 use Drupal\Core\Menu\MenuTreeParameters;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\menu_link_content\MenuLinkContentInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Menu link migration.
diff --git a/core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php b/core/modules/menu_ui/tests/tests/src/Kernel/Migrate/MigrateMenuSettingsTest.php
similarity index 73%
rename from core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php
rename to core/modules/menu_ui/tests/tests/src/Kernel/Migrate/MigrateMenuSettingsTest.php
index c1655c65f361b501fc43efaa58f4784d413a22a6..297384c9e56b0780b63209a9c921634771e75370 100644
--- a/core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php
+++ b/core/modules/menu_ui/tests/tests/src/Kernel/Migrate/MigrateMenuSettingsTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\menu_ui\Tests\Migrate\MigrateMenuSettingsTest.
+ * Contains \Drupal\Tests\menu_ui\Kernel\Migrate\MigrateMenuSettingsTest.
  */
 
-namespace Drupal\menu_ui\Tests\Migrate;
+namespace Drupal\Tests\menu_ui\Kernel\Migrate;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of menu_ui settings.
diff --git a/core/modules/migrate/src/Tests/MigrateDumpAlterInterface.php b/core/modules/migrate/tests/src/Kernel/MigrateDumpAlterInterface.php
similarity index 53%
rename from core/modules/migrate/src/Tests/MigrateDumpAlterInterface.php
rename to core/modules/migrate/tests/src/Kernel/MigrateDumpAlterInterface.php
index 3f2265772d666c53259eac3be08ee06f8c9548a7..4d006c910190ea361126b0ec6a64ee3b613bb76d 100644
--- a/core/modules/migrate/src/Tests/MigrateDumpAlterInterface.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateDumpAlterInterface.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateDumpAlterInterface.
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateDumpAlterInterface.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate\Kernel;
 
-use Drupal\simpletest\TestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 /**
  * Allows tests to alter dumps after they have loaded.
@@ -19,9 +19,9 @@ interface MigrateDumpAlterInterface {
   /**
    * Allows tests to alter dumps after they have loaded.
    *
-   * @param \Drupal\simpletest\TestBase $test
+   * @param \Drupal\KernelTests\KernelTestBase $test
    *   The test that is being run.
    */
-  public static function migrateDumpAlter(TestBase $test);
+  public static function migrateDumpAlter(KernelTestBase $test);
 
 }
diff --git a/core/modules/migrate/src/Tests/MigrateEmbeddedDataTest.php b/core/modules/migrate/tests/src/Kernel/MigrateEmbeddedDataTest.php
similarity index 92%
rename from core/modules/migrate/src/Tests/MigrateEmbeddedDataTest.php
rename to core/modules/migrate/tests/src/Kernel/MigrateEmbeddedDataTest.php
index 70b5d8f2b4fcb7a120590bcd10dee19a69dddd8f..ac110954a259da79a8628e7722497f036cdbd0db 100644
--- a/core/modules/migrate/src/Tests/MigrateEmbeddedDataTest.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateEmbeddedDataTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateEmbeddedDataTest.
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateEmbeddedDataTest.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate\Kernel;
 
 use Drupal\migrate\Plugin\Migration;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 /**
  * Tests the EmbeddedDataSource plugin.
diff --git a/core/modules/migrate/src/Tests/MigrateEventsTest.php b/core/modules/migrate/tests/src/Kernel/MigrateEventsTest.php
similarity index 98%
rename from core/modules/migrate/src/Tests/MigrateEventsTest.php
rename to core/modules/migrate/tests/src/Kernel/MigrateEventsTest.php
index baa4149b0365af307fd521c1db3afcb1c7788222..51ccb012c62b02188acb1045c933c8dc30eba2fe 100644
--- a/core/modules/migrate/src/Tests/MigrateEventsTest.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateEventsTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateEventsTest.
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateEventsTest.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate\Kernel;
 
 use Drupal\migrate\Event\MigrateImportEvent;
 use Drupal\migrate\Event\MigrateMapDeleteEvent;
@@ -16,7 +16,7 @@
 use Drupal\migrate\Event\MigrateEvents;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\Plugin\Migration;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 /**
  * Tests events fired on migrations.
diff --git a/core/modules/migrate/src/Tests/MigrateInterruptionTest.php b/core/modules/migrate/tests/src/Kernel/MigrateInterruptionTest.php
similarity index 93%
rename from core/modules/migrate/src/Tests/MigrateInterruptionTest.php
rename to core/modules/migrate/tests/src/Kernel/MigrateInterruptionTest.php
index e65607a134b2b38e1733dfc6a6fd6ad8511e4480..1fc39efce27c31e5d84077c8d9e576b1eb4317ab 100644
--- a/core/modules/migrate/src/Tests/MigrateInterruptionTest.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateInterruptionTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateInterruptionTest.
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateInterruptionTest.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate\Kernel;
 
 use Drupal\migrate\Plugin\Migration;
 use Drupal\migrate\Event\MigratePostRowSaveEvent;
@@ -13,7 +13,7 @@
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Event\MigrateEvents;
 use Drupal\migrate\MigrateExecutable;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 /**
  * Tests interruptions triggered during migrations.
diff --git a/core/modules/migrate/src/Tests/MigrateMessageTest.php b/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php
similarity index 95%
rename from core/modules/migrate/src/Tests/MigrateMessageTest.php
rename to core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php
index 30211e1dc7f37b74e664a1cfb00155d5337f667f..c68bd43d395d3291b17f41361549acbffc5863f1 100644
--- a/core/modules/migrate/src/Tests/MigrateMessageTest.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php
@@ -2,18 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateMessageTest.
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateMessageTest.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate\Kernel;
 
+use Drupal\KernelTests\KernelTestBase;
 use Drupal\migrate\Plugin\Migration;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Event\MigrateEvents;
 use Drupal\migrate\Event\MigrateIdMapMessageEvent;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\MigrateMessageInterface;
-use Drupal\simpletest\KernelTestBase;
 
 /**
  * Tests whether idmap messages are sent to message interface when requested.
diff --git a/core/modules/migrate/src/Tests/MigrateRollbackTest.php b/core/modules/migrate/tests/src/Kernel/MigrateRollbackTest.php
similarity index 97%
rename from core/modules/migrate/src/Tests/MigrateRollbackTest.php
rename to core/modules/migrate/tests/src/Kernel/MigrateRollbackTest.php
index 022973edc16dbdec82163daa3b4a9406e0c78249..7ef5b1a2b993a4a0412f11e792e10358596ec44d 100644
--- a/core/modules/migrate/src/Tests/MigrateRollbackTest.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateRollbackTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateRollbackTest.
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateRollbackTest.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate\Kernel;
 
 use Drupal\migrate\Plugin\Migration;
 use Drupal\migrate\MigrateExecutable;
@@ -13,6 +13,7 @@
 use Drupal\migrate\Row;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\Tests\migrate\Kernel\MigrateTestBase;
 
 /**
  * Tests rolling back of imports.
diff --git a/core/modules/migrate/src/Tests/MigrateSkipRowTest.php b/core/modules/migrate/tests/src/Kernel/MigrateSkipRowTest.php
similarity index 93%
rename from core/modules/migrate/src/Tests/MigrateSkipRowTest.php
rename to core/modules/migrate/tests/src/Kernel/MigrateSkipRowTest.php
index 1f4461f6b85266ab553f4f96261d9b4fe02162f7..f0a33ce3404cf8aa8e83dc5febb58b1baaf1f713 100644
--- a/core/modules/migrate/src/Tests/MigrateSkipRowTest.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateSkipRowTest.php
@@ -2,17 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateSkipRowTest.
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateSkipRowTest.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate\Kernel;
 
+use Drupal\KernelTests\KernelTestBase;
 use Drupal\migrate\MigrateMessage;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\Plugin\Migration;
-use Drupal\simpletest\KernelTestBase;
 
 /**
  * Tests row skips triggered during hook_migrate_prepare_row().
diff --git a/core/modules/migrate/src/Tests/MigrateStatusTest.php b/core/modules/migrate/tests/src/Kernel/MigrateStatusTest.php
similarity index 92%
rename from core/modules/migrate/src/Tests/MigrateStatusTest.php
rename to core/modules/migrate/tests/src/Kernel/MigrateStatusTest.php
index 19f186e3152dd1a31daf334edd9aee5d9a0590ee..9efa64f136d6d8c6fdd1081fdd60d7643b1c3382 100644
--- a/core/modules/migrate/src/Tests/MigrateStatusTest.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateStatusTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateStatusTest.
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateStatusTest.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate\Kernel;
 
 use Drupal\migrate\Plugin\Migration;
 use Drupal\migrate\Plugin\MigrationInterface;
diff --git a/core/modules/migrate/src/Tests/MigrateTestBase.php b/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php
similarity index 98%
rename from core/modules/migrate/src/Tests/MigrateTestBase.php
rename to core/modules/migrate/tests/src/Kernel/MigrateTestBase.php
index 27a095334136c446fc1d9f58f35e3da7d4497326..a599a45301b67e3cbe031f8985995d8219b2aca9 100644
--- a/core/modules/migrate/src/Tests/MigrateTestBase.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php
@@ -2,17 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrateTestBase.
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateTestBase.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate\Kernel;
 
 use Drupal\Core\Database\Database;
+use Drupal\KernelTests\KernelTestBase;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\MigrateMessageInterface;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\Row;
-use Drupal\simpletest\KernelTestBase;
 
 /**
  * Creates abstract base class for migration tests.
diff --git a/core/modules/migrate/src/Tests/MigrationTest.php b/core/modules/migrate/tests/src/Kernel/MigrationTest.php
similarity index 88%
rename from core/modules/migrate/src/Tests/MigrationTest.php
rename to core/modules/migrate/tests/src/Kernel/MigrationTest.php
index 998337d20ca7ec8c78aef4c60adef35b3a50d94f..1eb0faed1f001aa582b6106be2a5628c9f200e64 100644
--- a/core/modules/migrate/src/Tests/MigrationTest.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrationTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\MigrationTest.
+ * Contains \Drupal\Tests\migrate\Kernel\MigrationTest.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate\Kernel;
 
+use Drupal\KernelTests\KernelTestBase;
 use Drupal\migrate\Plugin\Migration;
-use Drupal\simpletest\KernelTestBase;
 
 /**
  * Tests the migration plugin.
@@ -29,7 +29,7 @@ class MigrationTest extends KernelTestBase {
   /**
    * Tests Migration::set().
    *
-   * @covers ::set()
+   * @covers ::set
    */
   public function testSetInvalidation() {
     $migration = new Migration([], uniqid(), [
diff --git a/core/modules/migrate/src/Tests/SqlBaseTest.php b/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php
similarity index 96%
rename from core/modules/migrate/src/Tests/SqlBaseTest.php
rename to core/modules/migrate/tests/src/Kernel/SqlBaseTest.php
index 0fd15a66c27bc84c605cc350626ecdc22c501c3c..dc4b32c93abee678fd4db96185c03784378e193d 100644
--- a/core/modules/migrate/src/Tests/SqlBaseTest.php
+++ b/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php
@@ -2,13 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\SqlBaseTest.
+ * Contains \Drupal\Tests\migrate\Kernel\SqlBaseTest.
  */
 
-namespace Drupal\migrate\Tests;
+namespace Drupal\Tests\migrate\Kernel;
 
 use Drupal\migrate\Plugin\migrate\source\TestSqlBase;
 use Drupal\Core\Database\Database;
+use Drupal\Tests\migrate\Kernel\MigrateTestBase;
 
 /**
  * Tests the functionality of SqlBase.
diff --git a/core/modules/migrate_drupal/src/Tests/d7/MigrateDrupal7TestBase.php b/core/modules/migrate_drupal/src/Tests/d7/MigrateDrupal7TestBase.php
deleted file mode 100644
index f4c8e88e0c447db6af9db842e6b214df0a8a9dc1..0000000000000000000000000000000000000000
--- a/core/modules/migrate_drupal/src/Tests/d7/MigrateDrupal7TestBase.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase.
- */
-
-namespace Drupal\migrate_drupal\Tests\d7;
-
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
-
-/**
- * Base class for Drupal 7 migration tests.
- */
-abstract class MigrateDrupal7TestBase extends MigrateDrupalTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->loadFixture(__DIR__ . '/../../../tests/fixtures/drupal7.php');
-  }
-
-}
diff --git a/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php b/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php
similarity index 82%
rename from core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
rename to core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php
index 032837c8f098aff5210d8af574b614909c98b531..68c4211b14ca827569f6052456f1e0dbeb53cc37 100644
--- a/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php
@@ -2,14 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\MigrateDrupalTestBase.
+ * Contains \Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase.
  */
 
-namespace Drupal\migrate_drupal\Tests;
+namespace Drupal\Tests\migrate_drupal\Kernel;
 
 use Drupal\Core\Database\Database;
-use Drupal\migrate\Tests\MigrateTestBase;
-use Drupal\Component\Plugin\Exception\PluginNotFoundException;
+use Drupal\Tests\migrate\Kernel\MigrateTestBase;
 
 /**
  * Base class for Drupal migration tests.
diff --git a/core/modules/migrate_drupal/src/Tests/d6/EntityContentBaseTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
similarity index 92%
rename from core/modules/migrate_drupal/src/Tests/d6/EntityContentBaseTest.php
rename to core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
index 5420fec0c3f7681a71a017280df3961a83d24df6..fc271a537ce1b60406ca8ba8ce9e8b18c4227b38 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/EntityContentBaseTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
@@ -2,13 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\EntityContentBaseTest.
+ * Contains \Drupal\Tests\migrate_drupal\Kernel\d6\EntityContentBaseTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\Tests\migrate_drupal\Kernel\d6;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\user\Entity\User;
 
 /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php
similarity index 90%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
rename to core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php
index f9b7950afa93d245383a42e460588f40c2410c27..c650f57966526a96ffbe60ed622d6a42a717ef17 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase.
+ * Contains \Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\Tests\migrate_drupal\Kernel\d6;
 
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 
 /**
  * Base class for Drupal 6 migration tests.
@@ -33,7 +33,7 @@ abstract class MigrateDrupal6TestBase extends MigrateDrupalTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->loadFixture( __DIR__ . '/../../../tests/fixtures/drupal6.php');
+    $this->loadFixture( __DIR__ . '/../../../fixtures/drupal6.php');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a15ff61abe19f6ade8152150cb08013b1163a3b
--- /dev/null
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase.
+ */
+
+namespace Drupal\Tests\migrate_drupal\Kernel\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+
+/**
+ * Base class for Drupal 7 migration tests.
+ */
+abstract class MigrateDrupal7TestBase extends MigrateDrupalTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->loadFixture(__DIR__ . '/../../../fixtures/drupal7.php');
+  }
+
+}
diff --git a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php b/core/modules/migrate_drupal/tests/src/Kernel/dependencies/MigrateDependenciesTest.php
similarity index 92%
rename from core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
rename to core/modules/migrate_drupal/tests/src/Kernel/dependencies/MigrateDependenciesTest.php
index 5749a5f724051e1495d737513945ee33942080be..fb63811a1ce545541b0caa3188f0f7e50f4ac33d 100644
--- a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/dependencies/MigrateDependenciesTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\dependencies\MigrateDependenciesTest.
+ * Contains \Drupal\Tests\migrate_drupal\Kernel\dependencies\MigrateDependenciesTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\dependencies;
+namespace Drupal\Tests\migrate_drupal\Kernel\dependencies;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Ensure the consistency among the dependencies for migrate.
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
index 733c21b227fabfd11e7214a122ca706d50024daf..19c7c098fdb3c3d4b88132986132f6b75c40eba2 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
@@ -2,10 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeRevisionTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeRevisionTest.
  */
 
 namespace Drupal\node\Tests\Migrate\d6;
+use Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeTestBase;
 
 /**
  * Node content revisions migration.
diff --git a/core/modules/node/src/Tests/Migrate/d7/NodeMigrateDeriverTest.php b/core/modules/node/src/Tests/Migrate/d7/NodeMigrateDeriverTest.php
index 9a05cac4d9584489d1d11125113dbd88960b197b..7a08d3fbc2db544d071662bb566216d0e1c1f983 100644
--- a/core/modules/node/src/Tests/Migrate/d7/NodeMigrateDeriverTest.php
+++ b/core/modules/node/src/Tests/Migrate/d7/NodeMigrateDeriverTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Tests\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests the d7_node node deriver.
diff --git a/core/modules/node/src/Tests/Migrate/MigrateNodeStubTest.php b/core/modules/node/tests/src/Kernel/Migrate/MigrateNodeStubTest.php
similarity index 80%
rename from core/modules/node/src/Tests/Migrate/MigrateNodeStubTest.php
rename to core/modules/node/tests/src/Kernel/Migrate/MigrateNodeStubTest.php
index 22d140bf3e568ce064147af5abd5552e008819b6..af4e0f8d22e188bc3e68a4012bfbabd0a25f48ba 100644
--- a/core/modules/node/src/Tests/Migrate/MigrateNodeStubTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/MigrateNodeStubTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\MigrateNodeStubTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\MigrateNodeStubTest.
  */
 
-namespace Drupal\node\Tests\Migrate;
+namespace Drupal\Tests\node\Kernel\Migrate;
 
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 use Drupal\migrate_drupal\Tests\StubTestTrait;
 use Drupal\node\Entity\NodeType;
 
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeBundleSettingsTest.php
similarity index 89%
rename from core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php
rename to core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeBundleSettingsTest.php
index d2296613a2b9867bcf251fe803067a63bc651bff..b98d0f3d3f8bf58751d5701a67dacc9e0c87a235 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeBundleSettingsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeBundleSettingsTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeBundleSettingsTest.
  */
 
-namespace Drupal\node\Tests\Migrate\d6;
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
 
 use Drupal\Core\Field\Entity\BaseFieldOverride;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\Node;
 
 /**
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeConfigsTest.php
similarity index 79%
rename from core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php
rename to core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeConfigsTest.php
index 26c5fcbc793370181223cac7758a2cb6a1cec10a..242ed8fccad060cd1ccaba3005817328a2e5bf12 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeConfigsTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeConfigsTest.
  */
 
-namespace Drupal\node\Tests\Migrate\d6;
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to node.settings.yml.
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeSettingPromoteTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeSettingPromoteTest.php
similarity index 77%
rename from core/modules/node/src/Tests/Migrate/d6/MigrateNodeSettingPromoteTest.php
rename to core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeSettingPromoteTest.php
index a4c785000de2c74e84d4f41f3315e7d92e87c1f4..2231b08a73e912c7dbb485a463d70eddd0c410e1 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeSettingPromoteTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeSettingPromoteTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeSettingPromoteTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeSettingPromoteTest.
  */
 
-namespace Drupal\node\Tests\Migrate\d6;
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
 
 use Drupal\Core\Field\Entity\BaseFieldOverride;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * @group migrate_drupal_6
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeSettingStickyTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeSettingStickyTest.php
similarity index 77%
rename from core/modules/node/src/Tests/Migrate/d6/MigrateNodeSettingStickyTest.php
rename to core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeSettingStickyTest.php
index 0adbb4330ddbabb7930d08213b827ba144fa7e8c..904d29e68c3930856a7a447fb8f96c9bf8a3208e 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeSettingStickyTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeSettingStickyTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeSettingStickyTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeSettingStickyTest.
  */
 
-namespace Drupal\node\Tests\Migrate\d6;
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
 
 use Drupal\Core\Field\Entity\BaseFieldOverride;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * @group migrate_drupal_6
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
similarity index 97%
rename from core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php
rename to core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
index 9279cdb3d0100017ef93ee4c3535e383058b0fb9..64088a82298529195c4d54a0d3c957ad6eeb84a2 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeTest.
  */
 
-namespace Drupal\node\Tests\Migrate\d6;
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
 
 use Drupal\Core\Database\Database;
-use Drupal\file\Tests\Migrate\d6\FileMigrationTestTrait;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\node\Entity\Node;
+use Drupal\Tests\file\Kernel\Migrate\d6\FileMigrationTestTrait;
 
 /**
  * Node content migration.
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTestBase.php
similarity index 82%
rename from core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php
rename to core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTestBase.php
index f88fba27fbc407ae7f398666259acc064044c2ea..3567cc2e530f797dac962bd14c1bfd8db50415b8 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTestBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTestBase.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeTestBase.
  */
 
-namespace Drupal\node\Tests\Migrate\d6;
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\user\Entity\User;
 
 /**
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php
similarity index 93%
rename from core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php
rename to core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php
index df11a12284b8689542c46f91495495cc66ce1486..ddfce03a33c90d312d03825c095eae1bdc251cb8 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTypeTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeTypeTest.
  */
 
-namespace Drupal\node\Tests\Migrate\d6;
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\NodeType;
 
 /**
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
similarity index 82%
rename from core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php
rename to core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
index 53b73da76d6a01a38c6f8dd9d73d72f6e5428a12..1a40e1589495571a651ee4fdc91c16a3fe4e349e 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateViewModesTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateViewModesTest.
  */
 
-namespace Drupal\node\Tests\Migrate\d6;
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityViewMode;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate view modes.
diff --git a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeSettingsTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeSettingsTest.php
similarity index 79%
rename from core/modules/node/src/Tests/Migrate/d7/MigrateNodeSettingsTest.php
rename to core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeSettingsTest.php
index 0bccde9c2641009b2e1bf7e6faf8f061ed4962e8..10a9f7eea09bffe86e7bb5b7a59434e68a1d636e 100644
--- a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeSettingsTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeSettingsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d7\MigrateNodeSettingsTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d7\MigrateNodeSettingsTest.
  */
 
-namespace Drupal\node\Tests\Migrate\d7;
+namespace Drupal\Tests\node\Kernel\Migrate\d7;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Upgrade variables to node.settings config object.
diff --git a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
similarity index 96%
rename from core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php
rename to core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
index 54d68c27d255985513df8e00757533de0c364399..e548fa0caa5c973454247d786f09c1b98507db6c 100644
--- a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d7\MigrateNodeTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d7\MigrateNodeTest.
  */
 
-namespace Drupal\node\Tests\Migrate\d7;
+namespace Drupal\Tests\node\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\node\Entity\Node;
 use Drupal\node\NodeInterface;
 
diff --git a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTitleLabelTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php
similarity index 88%
rename from core/modules/node/src/Tests/Migrate/d7/MigrateNodeTitleLabelTest.php
rename to core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php
index 93f3749897a7bd0568c6d8e97f93060a756c3288..ccf2533ecf24dc9631bdf35b379a1a296a9d63df 100644
--- a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTitleLabelTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d7\MigrateNodeTitleLabelTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d7\MigrateNodeTitleLabelTest.
  */
 
-namespace Drupal\node\Tests\Migrate\d7;
+namespace Drupal\Tests\node\Kernel\Migrate\d7;
 
 use Drupal\Core\Field\Entity\BaseFieldOverride;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of the title field label for node types.
diff --git a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTypeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
similarity index 94%
rename from core/modules/node/src/Tests/Migrate/d7/MigrateNodeTypeTest.php
rename to core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
index c3706a9a104abe5eb0f45a20b0171875cacb0dc0..059b2c999f8bf5d5d213654ef2bddbf1cb68bcf7 100644
--- a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTypeTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d7\MigrateNodeTypeTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d7\MigrateNodeTypeTest.
  */
 
-namespace Drupal\node\Tests\Migrate\d7;
+namespace Drupal\Tests\node\Kernel\Migrate\d7;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\FieldConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\node\Entity\NodeType;
 use Drupal\node\NodeTypeInterface;
 
diff --git a/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php b/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
similarity index 93%
rename from core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php
rename to core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
index f2d7b8f47e7823f62b3ea6672480dc1b6ba60593..02d4583326a7a61bab1c8c17e147e715394d5a8d 100644
--- a/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php
+++ b/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\path\Tests\Migrate\d6\MigrateUrlAliasTest.
+ * Contains \Drupal\Tests\path\Kernel\Migrate\d6\MigrateUrlAliasTest.
  */
 
-namespace Drupal\path\Tests\Migrate\d6;
+namespace Drupal\Tests\path\Kernel\Migrate\d6;
 
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * URL alias migration.
diff --git a/core/modules/path/src/Tests/Migrate/d7/MigrateUrlAliasTest.php b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php
similarity index 80%
rename from core/modules/path/src/Tests/Migrate/d7/MigrateUrlAliasTest.php
rename to core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php
index e8c2db651fc29fb99e0f135e2cb51054a0fbd984..ad5121cfd0eb921aa727bc6ee86ff342ca79ea9f 100644
--- a/core/modules/path/src/Tests/Migrate/d7/MigrateUrlAliasTest.php
+++ b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\path\Tests\Migrate\d7\MigrateUrlAliasTest.
+ * Contains \Drupal\Tests\path\Kernel\Migrate\d7\MigrateUrlAliasTest.
  */
 
-namespace Drupal\path\Tests\Migrate\d7;
+namespace Drupal\Tests\path\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests URL alias migration.
diff --git a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php b/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchPageTest.php
similarity index 90%
rename from core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
rename to core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchPageTest.php
index 8dc2b9c154356a2548017566ad04f91ca54e6675..5f12a3370f49ba373aa8a97c4fffae4c535cf8ad 100644
--- a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
+++ b/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchPageTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\search\Tests\Migrate\d6\MigrateSearchPageTest.
+ * Contains \Drupal\Tests\search\Kernel\Migrate\d6\MigrateSearchPageTest.
  */
 
-namespace Drupal\search\Tests\Migrate\d6;
+namespace Drupal\Tests\search\Kernel\Migrate\d6;
 
 use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\search\Entity\SearchPage;
 
 /**
diff --git a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php b/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php
similarity index 83%
rename from core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php
rename to core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php
index 634a3a40855da8d6ad63b28e0adfd08b3a08e0b0..a37a89e6630ccf000ca5da1167dc12f0f0c38253 100644
--- a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php
+++ b/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\search\Tests\Migrate\d6\MigrateSearchSettingsTest.
+ * Contains \Drupal\Tests\search\Kernel\Migrate\d6\MigrateSearchSettingsTest.
  */
 
-namespace Drupal\search\Tests\Migrate\d6;
+namespace Drupal\Tests\search\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to search.settings.yml.
diff --git a/core/modules/search/src/Tests/Migrate/d7/MigrateSearchPageTest.php b/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchPageTest.php
similarity index 90%
rename from core/modules/search/src/Tests/Migrate/d7/MigrateSearchPageTest.php
rename to core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchPageTest.php
index f333b4820c05ffe6a7d4f82a395be7d1fe7162c0..44cb6ad1ad3e1ba04559c46af426434abd00d232 100644
--- a/core/modules/search/src/Tests/Migrate/d7/MigrateSearchPageTest.php
+++ b/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchPageTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\search\Tests\Migrate\d7\MigrateSearchPageTest.
+ * Contains \Drupal\Tests\search\Kernel\Migrate\d7\MigrateSearchPageTest.
  */
 
-namespace Drupal\search\Tests\Migrate\d7;
+namespace Drupal\Tests\search\Kernel\Migrate\d7;
 
 use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\search\Entity\SearchPage;
 
 /**
diff --git a/core/modules/search/src/Tests/Migrate/d7/MigrateSearchSettingsTest.php b/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchSettingsTest.php
similarity index 90%
rename from core/modules/search/src/Tests/Migrate/d7/MigrateSearchSettingsTest.php
rename to core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchSettingsTest.php
index ac0e4c0eae144dc272388808b1c6995715287488..8373e05427869b61fb757b2496c2573c168e58cf 100644
--- a/core/modules/search/src/Tests/Migrate/d7/MigrateSearchSettingsTest.php
+++ b/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchSettingsTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\search\Tests\Migrate\d7\MigrateSearchSettingsTest.
+ * Contains \Drupal\Tests\search\Kernel\Migrate\d7\MigrateSearchSettingsTest.
  */
 
-namespace Drupal\search\Tests\Migrate\d7;
+namespace Drupal\Tests\search\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of Search variables to configuration.
diff --git a/core/modules/shortcut/src/Tests/Migrate/MigrateShortcutStubTest.php b/core/modules/shortcut/tests/src/Kernel/Migrate/MigrateShortcutStubTest.php
similarity index 78%
rename from core/modules/shortcut/src/Tests/Migrate/MigrateShortcutStubTest.php
rename to core/modules/shortcut/tests/src/Kernel/Migrate/MigrateShortcutStubTest.php
index ba9a0002e56f01bd63e7d0bfa4686388741525d5..526a2732ed61fbf7681bcf16503e2540e05d19a0 100644
--- a/core/modules/shortcut/src/Tests/Migrate/MigrateShortcutStubTest.php
+++ b/core/modules/shortcut/tests/src/Kernel/Migrate/MigrateShortcutStubTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\shortcut\Tests\Migrate\MigrateShortcutStubTest.
+ * Contains \Drupal\Tests\shortcut\Kernel\Migrate\MigrateShortcutStubTest.
  */
 
-namespace Drupal\shortcut\Tests\Migrate;
+namespace Drupal\Tests\shortcut\Kernel\Migrate;
 
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 use Drupal\migrate_drupal\Tests\StubTestTrait;
 
 /**
diff --git a/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutSetTest.php b/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php
similarity index 90%
rename from core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutSetTest.php
rename to core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php
index 4d41751608f1181a857a45b675a4d0c2a7c9cdeb..0e0510ba81482006ab87d5c547be5deb3713b304 100644
--- a/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutSetTest.php
+++ b/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\shortcut\Tests\Migrate\d7\MigrateShortcutSetTest.
+ * Contains \Drupal\Tests\shortcut\Kernel\Migrate\d7\MigrateShortcutSetTest.
  */
 
-namespace Drupal\shortcut\Tests\Migrate\d7;
+namespace Drupal\Tests\shortcut\Kernel\Migrate\d7;
 
 use Drupal\shortcut\Entity\ShortcutSet;
 use Drupal\shortcut\ShortcutSetInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Test shortcut_set migration to ShortcutSet entities.
diff --git a/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutSetUsersTest.php b/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetUsersTest.php
similarity index 87%
rename from core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutSetUsersTest.php
rename to core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetUsersTest.php
index 2b48e54c09bbd2a67040376c282f5b6cae646f55..76f49446ea4d31946b2ce1098b992cfc376bf540 100644
--- a/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutSetUsersTest.php
+++ b/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetUsersTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\shortcut\Tests\Migrate\d7\MigrateShortcutSetUsersTest.
+ * Contains \Drupal\Tests\shortcut\Tests\Migrate\d7\MigrateShortcutSetUsersTest.
  */
 
-namespace Drupal\shortcut\Tests\Migrate\d7;
+namespace Drupal\Tests\shortcut\Kernel\Migrate\d7;
 
 use Drupal\user\Entity\User;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Test shortcut_set_users migration.
diff --git a/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutTest.php b/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php
similarity index 91%
rename from core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutTest.php
rename to core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php
index 250418bbcfca822bf85d365667b19637fb26d8f7..45bb9d1a8982938a6ef5a60771078d6e4bc6d1ce 100644
--- a/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutTest.php
+++ b/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\shortcut\Tests\Migrate\d7\MigrateShortcutTest.
+ * Contains \Drupal\Tests\shortcut\Kernel\Migrate\d7\MigrateShortcutTest.
  */
 
-namespace Drupal\shortcut\Tests\Migrate\d7;
+namespace Drupal\Tests\shortcut\Kernel\Migrate\d7;
 
 use Drupal\shortcut\Entity\Shortcut;
 use Drupal\shortcut\ShortcutInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Test shortcut menu links migration to Shortcut entities.
diff --git a/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php b/core/modules/simpletest/tests/src/Kernel/Migrate/d6/MigrateSimpletestConfigsTest.php
similarity index 85%
rename from core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php
rename to core/modules/simpletest/tests/src/Kernel/Migrate/d6/MigrateSimpletestConfigsTest.php
index ad66d9fa11881678ab1edea18c7f5d7b57ec80e0..99c66ed4f32a53675b2b93e2c6e1e53f601c8236 100644
--- a/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php
+++ b/core/modules/simpletest/tests/src/Kernel/Migrate/d6/MigrateSimpletestConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\simpletest\Tests\Migrate\d6\MigrateSimpletestConfigsTest.
+ * Contains \Drupal\Tests\simpletest\Kernel\Migrate\d6\MigrateSimpletestConfigsTest.
  */
 
-namespace Drupal\simpletest\Tests\Migrate\d6;
+namespace Drupal\Tests\simpletest\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to simpletest.settings.yml.
diff --git a/core/modules/simpletest/src/Tests/Migrate/d7/MigrateSimpletestSettingsTest.php b/core/modules/simpletest/tests/src/Kernel/Migrate/d7/MigrateSimpletestSettingsTest.php
similarity index 81%
rename from core/modules/simpletest/src/Tests/Migrate/d7/MigrateSimpletestSettingsTest.php
rename to core/modules/simpletest/tests/src/Kernel/Migrate/d7/MigrateSimpletestSettingsTest.php
index 0528cc17659e53e1e630238408dfe13c8415c48f..ae62ef4491ae10fe0de2270e5c7dc4d7b6551265 100644
--- a/core/modules/simpletest/src/Tests/Migrate/d7/MigrateSimpletestSettingsTest.php
+++ b/core/modules/simpletest/tests/src/Kernel/Migrate/d7/MigrateSimpletestSettingsTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\simpletest\Tests\Migrate\d7\MigrateSimpletestSettingsTest.
+ * Contains \Drupal\Tests\simpletest\Kernel\Migrate\d7\MigrateSimpletestSettingsTest.
  */
 
-namespace Drupal\simpletest\Tests\Migrate\d7;
+namespace Drupal\Tests\simpletest\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of SimpleTest's variables to configuration.
diff --git a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php b/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php
similarity index 82%
rename from core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php
rename to core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php
index 7fe673c090d412a51baa82b59e3c275bbf372c21..dd90898eae7ab5dce1e49349be7101437f3c37ac 100644
--- a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php
+++ b/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\statistics\Tests\Migrate\d6\MigrateStatisticsConfigsTest.
+ * Contains \Drupal\Tests\statistics\Kernel\Migrate\d6\MigrateStatisticsConfigsTest.
  */
 
-namespace Drupal\statistics\Tests\Migrate\d6;
+namespace Drupal\Tests\statistics\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to statistics.settings.yml.
diff --git a/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php b/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php
similarity index 81%
rename from core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php
rename to core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php
index 686bce0910e02efc78253dc66a2b728b17618df7..25a145d4aff3f4d497b0d1e17cf79e248d2a2744 100644
--- a/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php
+++ b/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\syslog\Tests\Migrate\d6\MigrateSyslogConfigsTest.
+ * Contains \Drupal\Tests\syslog\Kernel\Migrate\d6\MigrateSyslogConfigsTest.
  */
 
-namespace Drupal\syslog\Tests\Migrate\d6;
+namespace Drupal\Tests\syslog\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to syslog.settings.yml.
diff --git a/core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php b/core/modules/syslog/tests/src/Kernel/Migrate/d7/MigrateSyslogConfigsTest.php
similarity index 83%
rename from core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php
rename to core/modules/syslog/tests/src/Kernel/Migrate/d7/MigrateSyslogConfigsTest.php
index f7ae20567c1b701200ee8626c188c5a533113548..f4830cd1136282dc0b20a7e1aa395b6e7914b70d 100644
--- a/core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php
+++ b/core/modules/syslog/tests/src/Kernel/Migrate/d7/MigrateSyslogConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\syslog\Tests\Migrate\d7\MigrateSyslogConfigsTest.
+ * Contains \Drupal\Tests\syslog\Kernel\Migrate\d7\MigrateSyslogConfigsTest.
  */
 
-namespace Drupal\syslog\Tests\Migrate\d7;
+namespace Drupal\Tests\syslog\Kernel\Migrate\d7;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Upgrade variables to syslog.settings.yml.
diff --git a/core/modules/system/src/Tests/Migrate/MigrateMenuTest.php b/core/modules/system/tests/src/Kernel/Migrate/MigrateMenuTest.php
similarity index 89%
rename from core/modules/system/src/Tests/Migrate/MigrateMenuTest.php
rename to core/modules/system/tests/src/Kernel/Migrate/MigrateMenuTest.php
index d3caee44612fe39d60a3bad276667a22e9ee74b1..0c2f85b3a0901fd00ab94f9d6f192d401b9afaf1 100644
--- a/core/modules/system/src/Tests/Migrate/MigrateMenuTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/MigrateMenuTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Migrate\MigrateMenuTest.
+ * Contains \Drupal\Tests\system\Kernel\Migrate\MigrateMenuTest.
  */
 
-namespace Drupal\system\Tests\Migrate;
+namespace Drupal\Tests\system\Kernel\Migrate;
 
 use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\system\Entity\Menu;
 
 /**
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateDateFormatTest.php
similarity index 89%
rename from core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php
rename to core/modules/system/tests/src/Kernel/Migrate/d6/MigrateDateFormatTest.php
index d18d43677261e7e667a4f21c511c3d5e94278f52..19dfe260ac10145505fd753072d5452c61ef8e69 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateDateFormatTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateDateFormatTest.
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateDateFormatTest.
  */
 
-namespace Drupal\system\Tests\Migrate\d6;
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
 
 use Drupal\Core\Datetime\Entity\DateFormat;
 use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade date formats to core.date_format.*.yml.
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemCronTest.php
similarity index 77%
rename from core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
rename to core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemCronTest.php
index 97c11705b03092573eaf1d85a5f01ffe111fdb6a..29b5522e17779063d0b156e4dfdeaed8b1fbe5b8 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemCronTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemCronTest.
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemCronTest.
  */
 
-namespace Drupal\system\Tests\Migrate\d6;
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade cron variable to system.*.yml.
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemDateTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemDateTest.php
similarity index 78%
rename from core/modules/system/src/Tests/Migrate/d6/MigrateSystemDateTest.php
rename to core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemDateTest.php
index 28b6bcb628961881400e2bdab24cc69fcf8fa901..71d4ef325e991f496873f078c9c13daec586baa7 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemDateTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemDateTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemDateTest.
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemDateTest.
  */
 
-namespace Drupal\system\Tests\Migrate\d6;
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade date time variables to system.date config
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemFileTest.php
similarity index 77%
rename from core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
rename to core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemFileTest.php
index e0ffc342524cabc47940be9a79c70c692740767e..73121684fc0b6566d083c1a50a986c6d394614b3 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemFileTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemFileTest.
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemFileTest.
  */
 
-namespace Drupal\system\Tests\Migrate\d6;
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to system.*.yml.
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageGdTest.php
similarity index 74%
rename from core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
rename to core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageGdTest.php
index bc41d5286f426c95c4eae7fb6fe12e6dd5092e3d..1b8ed5d4260a6ecc2eff407e7ea626c228f9b76f 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageGdTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemImageGdTest.
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemImageGdTest.
  */
 
-namespace Drupal\system\Tests\Migrate\d6;
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade image gd variables to system.*.yml.
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageTest.php
similarity index 73%
rename from core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
rename to core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageTest.php
index c297ad12b46a6f718961ad010b36542dc00d4ee9..655c1dfa692a5898fc30e4679f5c85de0051c20f 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemImageTest.
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemImageTest.
  */
 
-namespace Drupal\system\Tests\Migrate\d6;
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade image variables to system.*.yml.
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemLoggingTest.php
similarity index 79%
rename from core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
rename to core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemLoggingTest.php
index eba3d51c09ecb227fcde38294122ba537ca15892..36c01ffdabbdf9047f243330c297dab998bac0c2 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemLoggingTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemLoggingTest.
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemLoggingTest.
  */
 
-namespace Drupal\system\Tests\Migrate\d6;
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade error_level variable to system.logging.yml.
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTest.php
similarity index 77%
rename from core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
rename to core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTest.php
index dd3372fdb02855241717ecc13affb6c6ec38f52c..03be1099477dbc9e3b722f96846ddb263ac40b4b 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemMaintenanceTest.
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemMaintenanceTest.
  */
 
-namespace Drupal\system\Tests\Migrate\d6;
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade maintenance variables to system.*.yml.
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemPerformanceTest.php
similarity index 78%
rename from core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
rename to core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemPerformanceTest.php
index 6b2ebc2d186c0415771f209111f78c1422747b1b..33f8b509245a7732c3806d728df858da8c56ea73 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemPerformanceTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemPerformanceTest.
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemPerformanceTest.
  */
 
-namespace Drupal\system\Tests\Migrate\d6;
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade performance variables to system.*.yml.
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemRssTest.php
similarity index 76%
rename from core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
rename to core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemRssTest.php
index 3e5928946240fe7a42846d5a70a421170d3dee19..0c4a75a08b80bdd4cd6484fc456c06f2ed6df0c7 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemRssTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemRssTest.
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemRssTest.
  */
 
-namespace Drupal\system\Tests\Migrate\d6;
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade rss variable to system.*.yml.
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTest.php
similarity index 83%
rename from core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
rename to core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTest.php
index 46596c9406d2a20a5a577aaa9c2c3180c5de1981..eac379e5d1e882fdded017a3b85edeebb417aa03 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemSiteTest.
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemSiteTest.
  */
 
-namespace Drupal\system\Tests\Migrate\d6;
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade site variables to system.*.yml.
diff --git a/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyConfigsTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyConfigsTest.php
similarity index 82%
rename from core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyConfigsTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyConfigsTest.php
index e70efe96ba2cad86dfa1641d385acd60db962864..7f66c9c46056390791d6a50676b5282c2023b0b3 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyConfigsTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\MigrateTaxonomyConfigsTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\MigrateTaxonomyConfigsTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to taxonomy.settings.yml.
diff --git a/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyTermStubTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php
similarity index 92%
rename from core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyTermStubTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php
index 85ac634c20b786c091e0ce83dd2ad356ca4ecef4..a62a236be887b2ef6f81dd627d6fc8a3e67af3d5 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyTermStubTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\MigrateTaxonomyTermStubTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\MigrateTaxonomyTermStubTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate;
 
 use Drupal\migrate\Plugin\Migration;
 use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 use Drupal\migrate_drupal\Tests\StubTestTrait;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\Entity\Vocabulary;
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
similarity index 92%
rename from core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
index 952b038d13f5e5d7ddfe117b257c914449c4cf11..0d2a2265e7e76d090eca7d08bbb104e9f344bdfd 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTaxonomyTermTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateTaxonomyTermTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate\d6;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
 
 use Drupal\taxonomy\Entity\Term;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade taxonomy terms.
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTest.php
similarity index 88%
rename from core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTest.php
index b7a1b24e0f03619303e1ebcb0d9d8c934caef04c..9411f70c9d2b21b77beeb354383cac436d6b817b 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTaxonomyVocabularyTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateTaxonomyVocabularyTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate\d6;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
 
 use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate taxonomy vocabularies to taxonomy.vocabulary.*.yml.
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
similarity index 82%
rename from core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
index 23926ac259a93261cbe4ec4436a193e535fc4f24..30495aecc4f87fef098453145990917ccaf03704 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTermNodeRevisionTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateTermNodeRevisionTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate\d6;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade taxonomy term node associations.
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
similarity index 90%
rename from core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
index 0c51544d643e8a98b750215cfd7de6ab02f36ea1..82ca56b119ee2fb8fd6465c57d21a7c1c7b4e1a5 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTermNodeTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateTermNodeTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate\d6;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\Node;
 
 /**
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
similarity index 83%
rename from core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
index b0379428861de1a5096ba40283cd2af59267b859..c11a33b497f07af39e6108fe3efd18e4c5a182a7 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyEntityDisplayTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateVocabularyEntityDisplayTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate\d6;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Vocabulary entity display migration.
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
similarity index 86%
rename from core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
index f0e27d527283aa9807eff5e8b821982a75f80858..9bfc9c22673c1cca30410380a03cf561c3dd494f 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyEntityFormDisplayTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateVocabularyEntityFormDisplayTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate\d6;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Vocabulary entity form display migration.
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
similarity index 90%
rename from core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
index 9635a9e9a6e2ab127726735127e7c003da11c979..ba0321f8fbbc1361174c88b2c96b542c02f72ab6 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyFieldInstanceTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateVocabularyFieldInstanceTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate\d6;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Vocabulary field instance migration.
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldTest.php
similarity index 85%
rename from core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldTest.php
index b58b3eead14f752d7dc71715703a8b096fdaed97..46465443d4ce6c2ce3a10339b6fd3abc2d693f74 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyFieldTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateVocabularyFieldTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate\d6;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Vocabulary field migration.
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateNodeTaxonomyTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php
similarity index 90%
rename from core/modules/taxonomy/src/Tests/Migrate/d7/MigrateNodeTaxonomyTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php
index 488549052a60e5542be19563216e3d2b7dcd7bf7..76d301eb8ba0598b2877a1f505bfb26f6f397acd 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateNodeTaxonomyTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d7\MigrateNodeTaxonomyTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d7\MigrateNodeTaxonomyTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate\d7;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d7;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\FieldStorageConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\node\Entity\Node;
 use Drupal\node\NodeInterface;
 
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
similarity index 93%
rename from core/modules/taxonomy/src/Tests/Migrate/d7/MigrateTaxonomyTermTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
index 64dabde005fe30a51ff23fe2fd173fd088e79dce..0161a0520b849904efd6e4d5e8a578da086e2937 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateTaxonomyTermTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d7\MigrateTaxonomyTermTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d7\MigrateTaxonomyTermTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate\d7;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d7;
 
 use Drupal\taxonomy\Entity\Term;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\taxonomy\TermInterface;
 
 /**
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateTaxonomyVocabularyTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
similarity index 91%
rename from core/modules/taxonomy/src/Tests/Migrate/d7/MigrateTaxonomyVocabularyTest.php
rename to core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
index 5f4f6cd8d2de3fbd57a2856cbb2c829d3d10c9c6..7144c2a82a03ea8f27fd16214dd354bf21ae03a8 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateTaxonomyVocabularyTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d7\MigrateTaxonomyVocabularyTest.
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d7\MigrateTaxonomyVocabularyTest.
  */
 
-namespace Drupal\taxonomy\Tests\Migrate\d7;
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d7;
 
 use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\taxonomy\VocabularyInterface;
 
 /**
diff --git a/core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php b/core/modules/text/tests/src/Kernel/Migrate/MigrateTextConfigsTest.php
similarity index 79%
rename from core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php
rename to core/modules/text/tests/src/Kernel/Migrate/MigrateTextConfigsTest.php
index 02eefb929cf7858b57993d89bb12909c03b38c49..fd2c15d2e65f177d219ad818d8de245054279914 100644
--- a/core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php
+++ b/core/modules/text/tests/src/Kernel/Migrate/MigrateTextConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\text\Tests\Migrate\MigrateTextConfigsTest.
+ * Contains \Drupal\Tests\text\Kernel\Migrate\MigrateTextConfigsTest.
  */
 
-namespace Drupal\text\Tests\Migrate;
+namespace Drupal\Tests\text\Kernel\Migrate;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to text.settings.yml.
diff --git a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerNodeTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
similarity index 88%
rename from core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerNodeTest.php
rename to core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
index 3cf877197c7b777f7ef8ad3a1fa73781c964e904..fcf50c8a9200c6db7e68286ddde46797eb80f614 100644
--- a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerNodeTest.php
+++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\tracker\Tests\Migrate\d7\MigrateTrackerNodeTest.
+ * Contains \Drupal\Tests\tracker\Kernel\Migrate\d7\MigrateTrackerNodeTest.
  */
 
-namespace Drupal\tracker\Tests\Migrate\d7;
+namespace Drupal\Tests\tracker\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\Core\Database\Database;
 
 /**
diff --git a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerSettingsTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerSettingsTest.php
similarity index 75%
rename from core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerSettingsTest.php
rename to core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerSettingsTest.php
index f37871ef078e8df3028bfe5bc0c174bfd412b5c9..96139594f897af5ff5684fda80028b47672eb2e1 100644
--- a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerSettingsTest.php
+++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerSettingsTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\tracker\Tests\Migrate\d7\MigrateTrackerSettingsTest.
+ * Contains \Drupal\Tests\tracker\Kernel\Migrate\d7\MigrateTrackerSettingsTest.
  */
 
-namespace Drupal\tracker\Tests\Migrate\d7;
+namespace Drupal\Tests\tracker\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of Tracker settings to configuration.
diff --git a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerUserTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
similarity index 89%
rename from core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerUserTest.php
rename to core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
index a84b2f6f517a38ffcba381d3882505075f64048c..4751c36ecd8eecaaa5c1c9e656ad5be55f50c381 100644
--- a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerUserTest.php
+++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\tracker\Tests\Migrate\d7\MigrateTrackerUserTest.
+ * Contains \Drupal\Tests\tracker\Kernel\Migrate\d7\MigrateTrackerUserTest.
  */
 
-namespace Drupal\tracker\Tests\Migrate\d7;
+namespace Drupal\Tests\tracker\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\Core\Database\Database;
 
 /**
diff --git a/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php b/core/modules/update/tests/src/Kernel/Migrate/d6/MigrateUpdateConfigsTest.php
similarity index 85%
rename from core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
rename to core/modules/update/tests/src/Kernel/Migrate/d6/MigrateUpdateConfigsTest.php
index 29cf50293f5ef88cf9f7beee1a47caddb265c739..d491c7d6e676b3ec1243d47960a622992de7397b 100644
--- a/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
+++ b/core/modules/update/tests/src/Kernel/Migrate/d6/MigrateUpdateConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\update\Tests\Migrate\d6\MigrateUpdateConfigsTest.
+ * Contains \Drupal\Tests\update\Kernel\Migrate\d6\MigrateUpdateConfigsTest.
  */
 
-namespace Drupal\update\Tests\Migrate\d6;
+namespace Drupal\Tests\update\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to update.settings.yml.
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserAdminPassTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserAdminPassTest.php
similarity index 95%
rename from core/modules/user/src/Tests/Migrate/MigrateUserAdminPassTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/MigrateUserAdminPassTest.php
index 03684e6cee50971ed9058c4a081f0d7c9098dd53..7ea17ca81396445c8e347f4323d370066c43ddd0 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserAdminPassTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserAdminPassTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserAdminPassTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserAdminPassTest.
  */
 
-namespace Drupal\user\Tests\Migrate;
+namespace Drupal\Tests\user\Kernel\Migrate;
 
 use Drupal\migrate\Plugin\Migration;
-use Drupal\migrate\Tests\MigrateTestBase;
+use Drupal\Tests\migrate\Kernel\MigrateTestBase;
 use Drupal\user\Entity\User;
 
 /**
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureEntityDisplayTest.php
similarity index 83%
rename from core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureEntityDisplayTest.php
index bee41a4604bab355b47f1a203bcfbcee50691d67..14c7c491dd76791e7a99c2565d81d22283f0c856 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureEntityDisplayTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserPictureEntityDisplayTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserPictureEntityDisplayTest.
  */
 
-namespace Drupal\user\Tests\Migrate;
+namespace Drupal\Tests\user\Kernel\Migrate;
 
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * User picture entity display.
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityFormDisplayTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureEntityFormDisplayTest.php
similarity index 83%
rename from core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityFormDisplayTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureEntityFormDisplayTest.php
index f3711ff3b0177bbe1ee5f0016ce9c16c8debdc93..bc28eae82e3bceaee7551eca6d47fecb94583edb 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityFormDisplayTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureEntityFormDisplayTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserPictureEntityFormDisplayTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserPictureEntityFormDisplayTest.
  */
 
-namespace Drupal\user\Tests\Migrate;
+namespace Drupal\Tests\user\Kernel\Migrate;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of the user_picture field's entity form display settings.
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldInstanceTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureFieldInstanceTest.php
similarity index 83%
rename from core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldInstanceTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureFieldInstanceTest.php
index 4dbb36b688f8ba3b1115f1e342e9341160242236..6e871139f9098886457af1c1ff2147afbf71c051 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldInstanceTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureFieldInstanceTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserPictureFieldInstanceTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserPictureFieldInstanceTest.
  */
 
-namespace Drupal\user\Tests\Migrate;
+namespace Drupal\Tests\user\Kernel\Migrate;
 
 use Drupal\Core\Field\FieldConfigInterface;
 use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * User picture field instance migration.
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureFieldTest.php
similarity index 83%
rename from core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureFieldTest.php
index 20d036a2eba67ebdf41cfe0cd90b571321e2f53e..3644493cbc01a3dc8fd5d921b53955f550bd3852 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureFieldTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserPictureFieldTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserPictureFieldTest.
  */
 
-namespace Drupal\user\Tests\Migrate;
+namespace Drupal\Tests\user\Kernel\Migrate;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\FieldStorageConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * User picture field migration.
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserProfileEntityDisplayTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileEntityDisplayTest.php
similarity index 87%
rename from core/modules/user/src/Tests/Migrate/MigrateUserProfileEntityDisplayTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileEntityDisplayTest.php
index 1814d73a3cc0c30f2cf789ae40e4f20b43cceb18..11c40d536544fd4958e0e03d4f01ba02c597436f 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserProfileEntityDisplayTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileEntityDisplayTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserProfileEntityDisplayTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserProfileEntityDisplayTest.
  */
 
-namespace Drupal\user\Tests\Migrate;
+namespace Drupal\Tests\user\Kernel\Migrate;
 
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests the user profile entity display migration.
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserProfileEntityFormDisplayTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileEntityFormDisplayTest.php
similarity index 89%
rename from core/modules/user/src/Tests/Migrate/MigrateUserProfileEntityFormDisplayTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileEntityFormDisplayTest.php
index f39602e0987cc0d47870fe273a0ce6fed901cd2d..d2126076b2d0fd7d5554c8d9a711f3d3cd54f362 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserProfileEntityFormDisplayTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileEntityFormDisplayTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserProfileEntityFormDisplayTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserProfileEntityFormDisplayTest.
  */
 
-namespace Drupal\user\Tests\Migrate;
+namespace Drupal\Tests\user\Kernel\Migrate;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests the user profile entity form display migration.
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserProfileFieldInstanceTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldInstanceTest.php
similarity index 93%
rename from core/modules/user/src/Tests/Migrate/MigrateUserProfileFieldInstanceTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldInstanceTest.php
index 8498a3670b925e3257b082dffacda9367d71122d..d2d2e9d519f58d8fd370942e1491125f15eba8cb 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserProfileFieldInstanceTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldInstanceTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserProfileFieldInstanceTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserProfileFieldInstanceTest.
  */
 
-namespace Drupal\user\Tests\Migrate;
+namespace Drupal\Tests\user\Kernel\Migrate;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests the user profile field instance migration.
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserProfileFieldTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldTest.php
similarity index 93%
rename from core/modules/user/src/Tests/Migrate/MigrateUserProfileFieldTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldTest.php
index 1abd419a3fd27ae5beb09950dbe353026f973bbc..bb2edf45329c0161e9161e948dce799279ff25ff 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserProfileFieldTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserProfileFieldTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserProfileFieldTest.
  */
 
-namespace Drupal\user\Tests\Migrate;
+namespace Drupal\Tests\user\Kernel\Migrate;
 
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests the user profile field migration.
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserStubTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserStubTest.php
similarity index 77%
rename from core/modules/user/src/Tests/Migrate/MigrateUserStubTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/MigrateUserStubTest.php
index 0a65ddf2d2b1a2265dce991642f00a9a362e3e0a..8e7e6eff2b54967eac8f6d89a6b7b0c66af9081f 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserStubTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserStubTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserStubTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserStubTest.
  */
 
-namespace Drupal\user\Tests\Migrate;
+namespace Drupal\Tests\user\Kernel\Migrate;
 
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 use Drupal\migrate_drupal\Tests\StubTestTrait;
 
 /**
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php
similarity index 97%
rename from core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php
index 3dee8c508683a2778ec358979647c78a3aa794f6..cd510210191528ea33b4ceb070912ee9bfa43b4c 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d6\MigrateUserConfigsTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d6\MigrateUserConfigsTest.
  */
 
-namespace Drupal\user\Tests\Migrate\d6;
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\user\AccountSettingsForm;
 use Drupal\Core\Database\Database;
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserContactSettingsTest.php
similarity index 83%
rename from core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserContactSettingsTest.php
index 1bdf5a5411d0160717a16f1e55c2aa08776869ee..11bbb1a5e7858a07124a7019c2d3b1f84ef5336c 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserContactSettingsTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d6\MigrateUserContactSettingsTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d6\MigrateUserContactSettingsTest.
  */
 
-namespace Drupal\user\Tests\Migrate\d6;
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Users contact settings migration.
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureFileTest.php
similarity index 89%
rename from core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureFileTest.php
index 5b338ec41a918997475cd75e378892fd683bf89c..d5535b8e282378e7092d74f0e3fe4f9edd8fd41b 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureFileTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d6\MigrateUserPictureFileTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d6\MigrateUserPictureFileTest.
  */
 
-namespace Drupal\user\Tests\Migrate\d6;
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
 
 use Drupal\file\Entity\File;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * User pictures migration.
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php
similarity index 93%
rename from core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php
index e4b5dd326d8c2b8d86ffdb0b452e311fa5e3ffc7..8d273faa6c06d6814539dc08fff632cc1c7b892f 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d6\MigrateUserProfileValuesTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d6\MigrateUserProfileValuesTest.
  */
 
-namespace Drupal\user\Tests\Migrate\d6;
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\user\Entity\User;
 
 /**
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php
similarity index 93%
rename from core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php
index e583d04d947c852d03659d3468f8c6ffc8b9abb1..aeab36f34f8232f5efe8bd61d5ccabdbdc2c1d16 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d6\MigrateUserRoleTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d6\MigrateUserRoleTest.
  */
 
-namespace Drupal\user\Tests\Migrate\d6;
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
 
 use Drupal\user\Entity\Role;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade user roles to user.role.*.yml.
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php
similarity index 96%
rename from core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php
index 4f86d74c765d3ea35742a6f8ab736650a4d6b352..a7e8f4db2b144fe4fb7e3ef9abece7f60b1c808d 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php
@@ -2,17 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d6\MigrateUserTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d6\MigrateUserTest.
  */
 
-namespace Drupal\user\Tests\Migrate\d6;
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\user\Entity\User;
 use Drupal\file\Entity\File;
 use Drupal\Core\Database\Database;
 use Drupal\user\RoleInterface;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Users migration.
diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserFloodTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php
similarity index 80%
rename from core/modules/user/src/Tests/Migrate/d7/MigrateUserFloodTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php
index 020e15cc223353643e150d925f44ba03b757df6b..03510060a0441033eddda1584da954602298e4da 100644
--- a/core/modules/user/src/Tests/Migrate/d7/MigrateUserFloodTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d7\MigrateUserFloodTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d7\MigrateUserFloodTest.
  */
 
-namespace Drupal\user\Tests\Migrate\d7;
+namespace Drupal\Tests\user\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Migrates user flood control configuration.
diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserMailTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserMailTest.php
similarity index 91%
rename from core/modules/user/src/Tests/Migrate/d7/MigrateUserMailTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserMailTest.php
index 9c88f55dff141b4f5c317b2af2d82b4a3092dc3c..a9645de140330305025f7b4ac0f5edbd13654f42 100644
--- a/core/modules/user/src/Tests/Migrate/d7/MigrateUserMailTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserMailTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d7\MigrateUserMailTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d7\MigrateUserMailTest.
  */
 
-namespace Drupal\user\Tests\Migrate\d7;
+namespace Drupal\Tests\user\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Migrates user mail configuration.
diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserRoleTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
similarity index 89%
rename from core/modules/user/src/Tests/Migrate/d7/MigrateUserRoleTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
index 3c94781099aa35c818ee564dac8c6ee3ab9822a0..46e78340bea0c60ab7d6fce3a131690c92cdc817 100644
--- a/core/modules/user/src/Tests/Migrate/d7/MigrateUserRoleTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d7\MigrateUserRoleTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d7\MigrateUserRoleTest.
  */
 
-namespace Drupal\user\Tests\Migrate\d7;
+namespace Drupal\Tests\user\Kernel\Migrate\d7;
 
 use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\user\Entity\Role;
 use Drupal\user\RoleInterface;
 
diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
similarity index 93%
rename from core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
index 149672b293b239a2109fad52ec5156fe3989ae63..5ba23eb46414bc3a4ff496a6e689d714152a2035 100644
--- a/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d7\MigrateUserTest.
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d7\MigrateUserTest.
  */
 
-namespace Drupal\user\Tests\Migrate\d7;
+namespace Drupal\Tests\user\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\user\Entity\User;
 use Drupal\user\RoleInterface;
 use Drupal\user\UserInterface;
diff --git a/core/modules/user/src/Tests/Migrate/d7/UserMigrationClassTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/UserMigrationClassTest.php
similarity index 77%
rename from core/modules/user/src/Tests/Migrate/d7/UserMigrationClassTest.php
rename to core/modules/user/tests/src/Kernel/Migrate/d7/UserMigrationClassTest.php
index 393f40602f31ba7d8c0d2245206ca34cb1e763df..edd58a1f8de2d3da86e74299d76c636bd28eb269 100644
--- a/core/modules/user/src/Tests/Migrate/d7/UserMigrationClassTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/UserMigrationClassTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d7\UserMigrationClassTest.
+ * Contains Drupal\Tests\user\Kernel\Migrate\d7\UserMigrationClassTest.
  */
 
-namespace Drupal\user\Tests\Migrate\d7;
+namespace Drupal\Tests\user\Kernel\Migrate\d7;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests the user migration plugin class.
diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
index 160c84d5085d81d571960be46da823cc7bca212a..0902438cd01a1147cd99d76f287276f510afbcec 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -287,6 +287,13 @@ protected function bootEnvironment() {
     Database::addConnectionInfo('default', 'default', $this->getDatabaseConnectionInfo()['default']);
   }
 
+  /**
+   * @return string
+   */
+  public function getDatabasePrefix() {
+    return $this->databasePrefix;
+  }
+
   /**
    * Bootstraps a kernel for a test.
    */