diff --git a/core/modules/migrate_drupal/migration_templates/d6_aggregator_feed.yml b/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_aggregator_feed.yml
rename to core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_aggregator_item.yml b/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_aggregator_item.yml
rename to core/modules/aggregator/migration_templates/d6_aggregator_item.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_aggregator_settings.yml
rename to core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d7_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d7_aggregator_settings.yml
rename to core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/AggregatorFeed.php b/core/modules/aggregator/src/Plugin/migrate/source/d6/AggregatorFeed.php
similarity index 92%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/AggregatorFeed.php
rename to core/modules/aggregator/src/Plugin/migrate/source/d6/AggregatorFeed.php
index 849599e..4428862 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/AggregatorFeed.php
+++ b/core/modules/aggregator/src/Plugin/migrate/source/d6/AggregatorFeed.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\AggregatorFeed.
+ * Contains \Drupal\aggregator\Plugin\migrate\source\d6\AggregatorFeed.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\aggregator\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/AggregatorItem.php b/core/modules/aggregator/src/Plugin/migrate/source/d6/AggregatorItem.php
similarity index 90%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/AggregatorItem.php
rename to core/modules/aggregator/src/Plugin/migrate/source/d6/AggregatorItem.php
index 7656560..1c4677e 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/AggregatorItem.php
+++ b/core/modules/aggregator/src/Plugin/migrate/source/d6/AggregatorItem.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\AggregatorItem.
+ * Contains \Drupal\aggregator\Plugin\migrate\source\d6\AggregatorItem.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\aggregator\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php b/core/modules/aggregator/src/Tests/d6/MigrateAggregatorConfigsTest.php
similarity index 87%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php
rename to core/modules/aggregator/src/Tests/d6/MigrateAggregatorConfigsTest.php
index 60e863d..19c60d8 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php
+++ b/core/modules/aggregator/src/Tests/d6/MigrateAggregatorConfigsTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateAggregatorConfigsTest.
+ * Contains \Drupal\aggregator\Tests\d6\MigrateAggregatorConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\aggregator\Tests\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to aggregator.settings.yml.
  *
- * @group migrate_drupal
+ * @group aggregator
  */
 class MigrateAggregatorConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php b/core/modules/aggregator/src/Tests/d6/MigrateAggregatorFeedTest.php
similarity index 88%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php
rename to core/modules/aggregator/src/Tests/d6/MigrateAggregatorFeedTest.php
index 8b7bf61..ffd6f67 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php
+++ b/core/modules/aggregator/src/Tests/d6/MigrateAggregatorFeedTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateAggregatorFeedTest.
+ * Contains \Drupal\aggregator\Tests\d6\MigrateAggregatorFeedTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\aggregator\Tests\d6;
 
 use Drupal\aggregator\Entity\Feed;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to aggregator_feed entities.
  *
- * @group migrate_drupal
+ * @group aggregator
  */
 class MigrateAggregatorFeedTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php b/core/modules/aggregator/src/Tests/d6/MigrateAggregatorItemTest.php
similarity index 91%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php
rename to core/modules/aggregator/src/Tests/d6/MigrateAggregatorItemTest.php
index 8a047c1..74f418e 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php
+++ b/core/modules/aggregator/src/Tests/d6/MigrateAggregatorItemTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateAggregatorItemTest.
+ * Contains \Drupal\aggregator\Tests\d6\MigrateAggregatorItemTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\aggregator\Tests\d6;
 
 use Drupal\aggregator\Entity\Item;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade aggregator items.
  *
- * @group migrate_drupal
+ * @group aggregator
  */
 class MigrateAggregatorItemTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d7/MigrateAggregatorSettingsTest.php b/core/modules/aggregator/src/Tests/d7/MigrateAggregatorSettingsTest.php
similarity index 85%
rename from core/modules/migrate_drupal/src/Tests/d7/MigrateAggregatorSettingsTest.php
rename to core/modules/aggregator/src/Tests/d7/MigrateAggregatorSettingsTest.php
index a4fc2a4..3bbcc9e 100644
--- a/core/modules/migrate_drupal/src/Tests/d7/MigrateAggregatorSettingsTest.php
+++ b/core/modules/aggregator/src/Tests/d7/MigrateAggregatorSettingsTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d7\MigrateAggregatorSettingsTest.
+ * Contains \Drupal\aggregator\Tests\d7\MigrateAggregatorSettingsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d7;
+namespace Drupal\aggregator\Tests\d7;
+
+use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of Aggregator's variables to configuration.
  *
- * @group migrate_drupal_7
+ * @group aggregator
  */
 class MigrateAggregatorSettingsTest extends MigrateDrupal7TestBase {
 
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorFeedTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorFeedTest.php
similarity index 83%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorFeedTest.php
rename to core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorFeedTest.php
index ecb57ba..4101f3e 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorFeedTest.php
+++ b/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorFeedTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\AggregatorFeedTest.
+ * Contains \Drupal\Tests\aggregator\Unit\Plugin\migrate\source\d6\AggregatorFeedTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\aggregator\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 aggregator feed source plugin.
  *
- * @group migrate_drupal
+ * @group aggregator
  */
 class AggregatorFeedTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\AggregatorFeed';
+  const PLUGIN_CLASS = 'Drupal\aggregator\Plugin\migrate\source\d6\AggregatorFeed';
 
   protected $migrationConfiguration = array(
     'id' => 'test',
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorItemTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorItemTest.php
similarity index 84%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorItemTest.php
rename to core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorItemTest.php
index 29c0c0d..01bbca0 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorItemTest.php
+++ b/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorItemTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\AggregatorItemTest.
+ * Contains \Drupal\Tests\aggregator\Unit\Plugin\migrate\source\d6\AggregatorItemTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\aggregator\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 aggregator item source plugin.
  *
- * @group migrate_drupal
+ * @group aggregator
  */
 class AggregatorItemTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\AggregatorItem';
+  const PLUGIN_CLASS = 'Drupal\aggregator\Plugin\migrate\source\d6\AggregatorItem';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(