diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/DestinationCategoryTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/DestinationCategoryTest.php
index 82ad46fd28..4c41ff425f 100644
--- a/core/modules/migrate/tests/src/Kernel/Plugin/DestinationCategoryTest.php
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/DestinationCategoryTest.php
@@ -2,8 +2,18 @@
 
 namespace Drupal\Tests\migrate\Kernel\Plugin;
 
+use Drupal\ban\Plugin\migrate\destination\BlockedIP;
 use Drupal\KernelTests\FileSystemModuleDiscoveryDataProviderTrait;
+use Drupal\migrate\Plugin\migrate\destination\ComponentEntityDisplayBase;
+use Drupal\migrate\Plugin\migrate\destination\Config;
+use Drupal\migrate\Plugin\migrate\destination\EntityConfigBase;
+use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
+use Drupal\path\Plugin\migrate\destination\UrlAlias;
+use Drupal\shortcut\Plugin\migrate\destination\ShortcutSetUsers;
+use Drupal\statistics\Plugin\migrate\destination\NodeCounter;
+use Drupal\system\Plugin\migrate\destination\d7\ThemeSettings;
 use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\user\Plugin\migrate\destination\UserData;
 
 /**
  * Tests that all migrations are tagged as either content or configuration.
@@ -36,16 +46,53 @@ protected function setUp() {
   /**
    * @covers ::getDefinitions
    *
-   * @dataProvider providerMigrationCategoriesGrouped
    */
-  public function testGetGroupedDefinitions($groupedMigrations) {
-    $definitions = $this->migrationManager->getDefinitions();
-    foreach ($definitions as $id => $definition) {
-      if (in_array('Configuration', $definition['migration_tags'])) {
-        $this->assertTrue(in_array($id, $groupedMigrations['Configuration']));
+  public function testGetGroupedDefinitions() {
+    $definitions = array_keys($this->migrationManager->getDefinitions());
+
+    // Instantiate all migrations.
+    /** @var  \Drupal\migrate\Plugin\Migration[] $migrations */
+    $migrations = $this->migrationManager->createInstances($definitions);
+    foreach ($migrations as $id => $migration) {
+      if (in_array('Configuration', $migration->getMigrationTags())) {
+          if ($migration->getDestinationPlugin() instanceof Config ) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof EntityConfigBase) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof ThemeSettings) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof ComponentEntityDisplayBase) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof ShortcutSetUsers) {
+              $this->assertTrue(TRUE);
+          }
+          else {
+              $this->fail("The migration $id was set as Configuration.");
+          }
       }
-      elseif (in_array('Content', $definition['migration_tags'])) {
-        $this->assertTrue(in_array($id, $groupedMigrations['Content']));
+      elseif (in_array('Content', $migration->getMigrationTags())) {
+          if ($migration->getDestinationPlugin() instanceof EntityContentBase) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof UrlAlias) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof BlockedIP) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof NodeCounter) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof UserData) {
+              $this->assertTrue(TRUE);
+          }
+          else {
+              $this->fail("The migration $id was set as Content.");
+          }
       }
       else {
         $this->fail("The migration $id is not tagged as either content or configuration.");
@@ -53,181 +100,5 @@ public function testGetGroupedDefinitions($groupedMigrations) {
     }
   }
 
-  /**
-   * Provides test data for category testing.
-   */
-  public function providerMigrationCategoriesGrouped() {
-    return [
-      [
-        'all migrations' => [
-          'Configuration' => [
-            'action_settings',
-            'd6_action',
-            'd7_action',
-            'd6_aggregator_settings',
-            'd7_aggregator_settings',
-            'block_content_body_field',
-            'block_content_type',
-            'd6_block',
-            'd7_block',
-            'block_content_entity_display',
-            'block_content_entity_form_display',
-            'd6_book_settings',
-            'd6_comment_entity_display',
-            'd7_comment_entity_display',
-            'd6_comment_field',
-            'd7_comment_field',
-            'd6_comment_entity_form_display',
-            'd7_comment_entity_form_display',
-            'd6_comment_field_instance',
-            'd7_comment_field_instance',
-            'd6_comment_entity_form_display_subject',
-            'd7_comment_entity_form_display_subject',
-            'd6_comment_type',
-            'd7_comment_type',
-            'contact_category',
-            'd6_contact_settings',
-            'd7_contact_settings',
-            'd6_system_cron',
-            'd7_global_theme_settings',
-            'd7_theme_settings',
-            'd6_dblog_settings',
-            'd7_dblog_settings',
-            'd6_date_formats',
-            'default_language',
-            'd6_language_content_settings',
-            'd7_system_authorize',
-            'd7_system_cron',
-            'd7_system_date',
-            'd7_system_file',
-            'd7_filter_settings',
-            'd7_language_content_settings',
-            'd7_system_mail',
-            'd7_system_performance',
-            'text_settings',
-            'd6_field',
-            'd7_field',
-            'd6_field_formatter_settings',
-            'd7_field_formatter_settings',
-            'd6_field_instance',
-            'd7_field_instance',
-            'd6_field_instance_widget_settings',
-            'd7_field_instance_widget_settings',
-            'file_settings',
-            'd6_system_file',
-            'd6_filter_format',
-            'd7_filter_format',
-            'd6_forum_settings',
-            'd7_forum_settings',
-            'd6_imagecache_presets',
-            'd7_image_settings',
-            'system_image_gd',
-            'd7_image_styles',
-            'system_image',
-            'd6_language_negotiation_settings',
-            'd7_language_negotiation_settings',
-            'language_prefixes_and_domains',
-            'language',
-            'd6_language_types',
-            'd7_language_types',
-            'locale_settings',
-            'd6_system_maintenance_translation',
-            'system_maintenance',
-            'd6_menu',
-            'd7_menu',
-            'menu_settings',
-            'd6_node_settings',
-            'd7_node_settings',
-            'd7_node_title_label',
-            'd6_node_setting_promote',
-            'd6_node_setting_status',
-            'd6_node_setting_sticky',
-            'd6_node_type',
-            'd7_node_type',
-            'd6_system_performance',
-            'system_rss',
-            'd6_search_settings',
-            'd7_search_settings',
-            'search_page',
-            'd7_shortcut_set',
-            'd6_simpletest_settings',
-            'd7_simpletest_settings',
-            'd6_system_site_translation',
-            'system_site',
-            'statistics_node_counter',
-            'statistics_settings',
-            'd7_syslog_settings',
-            'd6_system_date',
-            'd6_syslog_settings',
-            'system_logging',
-            'taxonomy_settings',
-            'd6_taxonomy_vocabulary',
-            'd6_taxonomy_vocabulary_translation',
-            'd7_taxonomy_vocabulary',
-            'd7_tracker_settings',
-            'update_settings',
-            'd6_upload_entity_display',
-            'd6_upload_field',
-            'd6_upload_field_instance',
-            'd6_upload_entity_form_display',
-            'd6_user_settings_translation',
-            'd6_user_settings',
-            'd7_user_flood',
-            'd6_user_mail_translation',
-            'd6_user_mail',
-            'd7_user_mail',
-            'user_picture_entity_display',
-            'user_picture_field',
-            'user_picture_field_instance',
-            'user_picture_entity_form_display',
-            'user_profile_entity_display',
-            'user_profile_field',
-            'd6_user_profile_field_instance_translation',
-            'user_profile_field_instance',
-            'user_profile_entity_form_display',
-            'd6_user_role',
-            'd7_user_role',
-            'd6_view_modes',
-            'd7_view_modes',
-            'd6_vocabulary_entity_display',
-            'd6_vocabulary_field',
-            'd6_vocabulary_field_instance',
-            'd6_vocabulary_entity_form_display',
-          ],
-          'Content' => [
-            'd6_aggregator_feed',
-            'd7_aggregator_feed',
-            'd6_aggregator_item',
-            'd7_aggregator_item',
-            'd7_blocked_ips',
-            'd6_book',
-            'd6_comment',
-            'd7_comment',
-            'd6_custom_block',
-            'd7_custom_block',
-            'd6_file',
-            'd7_file',
-            'd6_upload',
-            'd6_menu_links',
-            'd7_menu_links',
-            'd7_file_private',
-            'd6_profile_values',
-            'd7_shortcut',
-            'd7_shortcut_set_users',
-            'd6_taxonomy_term',
-            'd6_taxonomy_term_translation',
-            'd7_tracker_node',
-            'd7_tracker_user',
-            'd6_url_alias',
-            'd7_url_alias',
-            'd6_user',
-            'd7_user',
-            'd6_user_contact_settings',
-            'd6_user_picture_file',
-          ],
-        ],
-      ],
-    ];
-  }
 
 }
diff --git a/core/modules/shortcut/migrations/d7_shortcut_set_users.yml b/core/modules/shortcut/migrations/d7_shortcut_set_users.yml
index ff3d3e8810..9797c0a26f 100644
--- a/core/modules/shortcut/migrations/d7_shortcut_set_users.yml
+++ b/core/modules/shortcut/migrations/d7_shortcut_set_users.yml
@@ -2,7 +2,7 @@ id: d7_shortcut_set_users
 label: Shortcut set user mapping
 migration_tags:
   - Drupal 7
-  - Content
+  - Configuration
 source:
   plugin: d7_shortcut_set_users
 process:
diff --git a/core/modules/statistics/migrations/statistics_node_counter.yml b/core/modules/statistics/migrations/statistics_node_counter.yml
index 04db5916ec..748a4a83c0 100644
--- a/core/modules/statistics/migrations/statistics_node_counter.yml
+++ b/core/modules/statistics/migrations/statistics_node_counter.yml
@@ -3,7 +3,7 @@ label: Node counter
 migration_tags:
   - Drupal 6
   - Drupal 7
-  - Configuration
+  - Content
 source:
   plugin: node_counter
 process: