diff --git a/core/modules/migrate_drupal/migration_templates/d6_filter_format.yml b/core/modules/filter/migration_templates/d6_filter_format.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_filter_format.yml
rename to core/modules/filter/migration_templates/d6_filter_format.yml
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FilterFormat.php b/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FilterFormat.php
rename to core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php
index f832179..6d99e05 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FilterFormat.php
+++ b/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\FilterFormat.
+ * Contains \Drupal\filter\Plugin\migrate\source\d6\FilterFormat.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\filter\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFilterFormatTest.php b/core/modules/filter/src/Tests/d6/MigrateFilterFormatTest.php
similarity index 90%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateFilterFormatTest.php
rename to core/modules/filter/src/Tests/d6/MigrateFilterFormatTest.php
index 8702b0e..2153144 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFilterFormatTest.php
+++ b/core/modules/filter/src/Tests/d6/MigrateFilterFormatTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateFilterFormatTest.
+ * Contains \Drupal\filter\Tests\d6\MigrateFilterFormatTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\filter\Tests\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to filter.formats.*.yml.
  *
- * @group migrate_drupal
+ * @group filter
  */
 class MigrateFilterFormatTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php b/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php
similarity index 91%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php
rename to core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php
index 49ec31a..ebdb776 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php
+++ b/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\FilterFormatTest.
+ * Contains \Drupal\Tests\filter\Unit\Plugin\migrate\source\d6\FilterFormatTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\filter\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 filter_formats table source plugin.
  *
- * @group migrate_drupal
+ * @group filter
  */
 class FilterFormatTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\FilterFormat';
+  const PLUGIN_CLASS = 'Drupal\filter\Plugin\migrate\source\d6\FilterFormat';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(