diff --git a/core/modules/migrate_drupal/migration_templates/d6_forum_settings.yml b/core/modules/forum/migration_templates/d6_forum_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_forum_settings.yml
rename to core/modules/forum/migration_templates/d6_forum_settings.yml
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php b/core/modules/forum/src/Tests/d6/MigrateForumConfigsTest.php
similarity index 89%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php
rename to core/modules/forum/src/Tests/d6/MigrateForumConfigsTest.php
index d02fe7b..07fbc44 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php
+++ b/core/modules/forum/src/Tests/d6/MigrateForumConfigsTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateForumConfigsTest.
+ * Contains \Drupal\forum\Tests\d6\MigrateForumConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\forum\Tests\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to forum.settings.yml.
  *
- * @group migrate_drupal
+ * @group forum
  */
 class MigrateForumConfigsTest extends MigrateDrupal6TestBase {