diff --git a/core/modules/migrate_drupal/migration_templates/d6_system_cron.yml b/core/modules/system/migration_templates/d6_system_cron.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_system_cron.yml
rename to core/modules/system/migration_templates/d6_system_cron.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_system_file.yml b/core/modules/system/migration_templates/d6_system_file.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_system_file.yml
rename to core/modules/system/migration_templates/d6_system_file.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_system_filter.yml b/core/modules/system/migration_templates/d6_system_filter.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_system_filter.yml
rename to core/modules/system/migration_templates/d6_system_filter.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_system_image.yml b/core/modules/system/migration_templates/d6_system_image.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_system_image.yml
rename to core/modules/system/migration_templates/d6_system_image.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_system_image_gd.yml b/core/modules/system/migration_templates/d6_system_image_gd.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_system_image_gd.yml
rename to core/modules/system/migration_templates/d6_system_image_gd.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_system_logging.yml b/core/modules/system/migration_templates/d6_system_logging.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_system_logging.yml
rename to core/modules/system/migration_templates/d6_system_logging.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_system_maintenance.yml b/core/modules/system/migration_templates/d6_system_maintenance.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_system_maintenance.yml
rename to core/modules/system/migration_templates/d6_system_maintenance.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_system_performance.yml b/core/modules/system/migration_templates/d6_system_performance.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_system_performance.yml
rename to core/modules/system/migration_templates/d6_system_performance.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_system_rss.yml b/core/modules/system/migration_templates/d6_system_rss.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_system_rss.yml
rename to core/modules/system/migration_templates/d6_system_rss.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_system_site.yml b/core/modules/system/migration_templates/d6_system_site.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_system_site.yml
rename to core/modules/system/migration_templates/d6_system_site.yml
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php b/core/modules/system/src/Plugin/migrate/process/d6/SystemUpdate7000.php
similarity index 92%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php
rename to core/modules/system/src/Plugin/migrate/process/d6/SystemUpdate7000.php
index 8e78c84..037e315 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php
+++ b/core/modules/system/src/Plugin/migrate/process/d6/SystemUpdate7000.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\SystemUpdate7000.
+ * Contains \Drupal\system\Plugin\migrate\process\d6\SystemUpdate7000.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\system\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemCronTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
similarity index 78%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemCronTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
index e5fd01b..c39f11e 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemCronTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemCronTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemCronTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade cron variable to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemCronTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemFileTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
similarity index 78%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemFileTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
index 5aa79cc..9a9ff2a 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemFileTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemFileTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemFileTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemFileTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemFilterTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFilterTest.php
similarity index 78%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemFilterTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemFilterTest.php
index 251b41b..108b39f 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemFilterTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFilterTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemFilterTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemFilterTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade filter variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemFilterTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemImageGdTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
similarity index 75%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemImageGdTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
index b2bd962..cdf9eae 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemImageGdTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemImageGdTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemImageGdTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade image gd variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemImageGdTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemImageTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
similarity index 75%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemImageTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
index ddc8328..e91e7cb 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemImageTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemImageTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemImageTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade image variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemImageTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemLoggingTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
similarity index 80%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemLoggingTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
index 2289096..963f58b 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemLoggingTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemLoggingTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemLoggingTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade error_level variable to system.logging.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemLoggingTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemMaintenanceTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
similarity index 79%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemMaintenanceTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
index 08229a6..581be5e 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemMaintenanceTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemMaintenanceTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemMaintenanceTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade maintenance variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemMaintenanceTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemPerformanceTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
similarity index 80%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemPerformanceTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
index 21f16fc..54e72fa 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemPerformanceTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemPerformanceTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemPerformanceTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade performance variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemPerformanceTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemRssTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
similarity index 76%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemRssTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
index 652e68a..6295a56 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemRssTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemRssTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemRssTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade rss variable to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemRssTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemSiteTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
similarity index 84%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemSiteTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
index 05841af..7591063 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemSiteTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemSiteTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemSiteTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade site variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemSiteTest extends MigrateDrupal6TestBase {