diff --git a/core/modules/migrate_drupal/migration_templates/d6_simpletest_settings.yml b/core/modules/migrate_drupal/migration_templates/d6_simpletest_settings.yml
deleted file mode 100644
index d616a59..0000000
--- a/core/modules/migrate_drupal/migration_templates/d6_simpletest_settings.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-id: d6_simpletest_settings
-label: Drupal 6 simpletest configuration
-migration_tags:
-  - Drupal 6
-source:
-  plugin: variable
-  variables:
-    - simpletest_clear_results
-    - simpletest_httpauth_method
-    - simpletest_httpauth_password
-    - simpletest_httpauth_username
-    - simpletest_verbose
-process:
-  clear_results: simpletest_clear_results
-  'httpauth/method': simpletest_httpauth_method
-  'httpauth/password': simpletest_httpauth_password
-  'httpauth/username': simpletest_httpauth_username
-  verbose: simpletest_verbose
-destination:
-  plugin: config
-  config_name: simpletest.settings
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php
deleted file mode 100644
index fe5f4d5..0000000
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSimpletestConfigsTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-
-/**
- * Upgrade variables to simpletest.settings.yml.
- *
- * @group migrate_drupal
- */
-class MigrateSimpletestConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('simpletest');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(['simpletest']);
-    $this->loadDumps(['Variable.php']);
-    $this->executeMigration('d6_simpletest_settings');
-  }
-
-  /**
-   * Tests migration of simpletest variables to simpletest.settings.yml.
-   */
-  public function testSimpletestSettings() {
-    $config = $this->config('simpletest.settings');
-    $this->assertIdentical(TRUE, $config->get('clear_results'));
-    $this->assertIdentical(CURLAUTH_BASIC, $config->get('httpauth.method'));
-    // NULL in the dump means defaults which is empty string. Same as omitting
-    // them.
-    $this->assertIdentical('', $config->get('httpauth.password'));
-    $this->assertIdentical('', $config->get('httpauth.username'));
-    $this->assertIdentical(TRUE, $config->get('verbose'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'simpletest.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
new file mode 100644
index 0000000..d616a59
--- /dev/null
+++ b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
@@ -0,0 +1,21 @@
+id: d6_simpletest_settings
+label: Drupal 6 simpletest configuration
+migration_tags:
+  - Drupal 6
+source:
+  plugin: variable
+  variables:
+    - simpletest_clear_results
+    - simpletest_httpauth_method
+    - simpletest_httpauth_password
+    - simpletest_httpauth_username
+    - simpletest_verbose
+process:
+  clear_results: simpletest_clear_results
+  'httpauth/method': simpletest_httpauth_method
+  'httpauth/password': simpletest_httpauth_password
+  'httpauth/username': simpletest_httpauth_username
+  verbose: simpletest_verbose
+destination:
+  plugin: config
+  config_name: simpletest.settings
diff --git a/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php b/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php
new file mode 100644
index 0000000..c44578d
--- /dev/null
+++ b/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\simpletest\Tests\Migrate\d6\MigrateSimpletestConfigsTest.
+ */
+
+namespace Drupal\simpletest\Tests\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to simpletest.settings.yml.
+ *
+ * @group simpletest
+ */
+class MigrateSimpletestConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('simpletest');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['simpletest']);
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_simpletest_settings');
+  }
+
+  /**
+   * Tests migration of simpletest variables to simpletest.settings.yml.
+   */
+  public function testSimpletestSettings() {
+    $config = $this->config('simpletest.settings');
+    $this->assertIdentical(TRUE, $config->get('clear_results'));
+    $this->assertIdentical(CURLAUTH_BASIC, $config->get('httpauth.method'));
+    // NULL in the dump means defaults which is empty string. Same as omitting
+    // them.
+    $this->assertIdentical('', $config->get('httpauth.password'));
+    $this->assertIdentical('', $config->get('httpauth.username'));
+    $this->assertIdentical(TRUE, $config->get('verbose'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'simpletest.settings', $config->get());
+  }
+
+}