diff --git a/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php b/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
index 779db2f8bfc6..764adfaef500 100644
--- a/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
+++ b/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to action.settings.yml.
  *
- * @group action
+ * @group migrate_drupal_6
  */
 class MigrateActionConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php
index 7cef21066633..b01417e99453 100644
--- a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php
+++ b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to aggregator.settings.yml.
  *
- * @group aggregator
+ * @group migrate_drupal_6
  */
 class MigrateAggregatorConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php
index 77f612724c96..2b9ee0dde78e 100644
--- a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php
+++ b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to aggregator_feed entities.
  *
- * @group aggregator
+ * @group migrate_drupal_6
  */
 class MigrateAggregatorFeedTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php
index 3d5716c13630..8930fef6971c 100644
--- a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php
+++ b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade aggregator items.
  *
- * @group aggregator
+ * @group migrate_drupal_6
  */
 class MigrateAggregatorItemTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php b/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
index d1d3696ae5a1..e5709116e0ac 100644
--- a/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
+++ b/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade block settings to block.block.*.yml.
  *
- * @group block
+ * @group migrate_drupal_6
  */
 class MigrateBlockTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php b/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php
index a4c5a571205e..36a7fed66674 100644
--- a/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php
+++ b/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade custom blocks.
  *
- * @group block_content
+ * @group migrate_drupal_6
  */
 class MigrateBlockContentTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php b/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
index 9d7a229f81a3..6dc09cd430bd 100644
--- a/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
+++ b/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to book.settings.yml.
  *
- * @group book
+ * @group migrate_drupal_6
  */
 class MigrateBookConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php b/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
index b0ebebbc206c..2ae4a28f8f93 100644
--- a/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
+++ b/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
@@ -13,7 +13,7 @@ use Drupal\node\Entity\Node;
 /**
  * Upgrade book structure.
  *
- * @group book
+ * @group migrate_drupal_6
  */
 class MigrateBookTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php
index 62b2f2876550..d81bbe2288ad 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php
+++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade comments.
  *
- * @group comment
+ * @group migrate_drupal_6
  */
 class MigrateCommentTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php
index 8d25d1cdec29..20c9a6af53a3 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php
+++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade comment type.
  *
- * @group comment
+ * @group migrate_drupal_6
  */
 class MigrateCommentTypeTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php
index 34f43151ead5..aae61f789527 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php
+++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php
@@ -10,7 +10,7 @@ namespace Drupal\comment\Tests\Migrate\d6;
 /**
  * Upgrade comment variables to entity.display.node.*.default.yml.
  *
- * @group comment
+ * @group migrate_drupal_6
  */
 class MigrateCommentVariableEntityDisplayTest extends MigrateCommentVariableDisplayBase {
 
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
index 9212f7292558..0a94c91d3d5b 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
+++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade comment subject variable to core.entity_form_display.comment.*.default.yml
  *
- * @group comment
+ * @group migrate_drupal_6
  */
 class MigrateCommentVariableEntityFormDisplaySubjectTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php
index d9820fee06fc..011a750846af 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php
+++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php
@@ -10,7 +10,7 @@ namespace Drupal\comment\Tests\Migrate\d6;
 /**
  * Upgrade comment variables to core.entity_form_display.node.*.default.yml.
  *
- * @group comment
+ * @group migrate_drupal_6
  */
 class MigrateCommentVariableEntityFormDisplayTest extends MigrateCommentVariableDisplayBase {
 
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php
index 468c18db25ee..ba3cae2a6208 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php
+++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade comment variables to field.storage.node.comment.yml.
  *
- * @group comment
+ * @group migrate_drupal_6
  */
 class MigrateCommentVariableFieldTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php
index 1daf99f40061..be8cf91636ad 100644
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php
+++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade comment variables to field.instance.node.*.comment.yml.
  *
- * @group comment
+ * @group migrate_drupal_6
  */
 class MigrateCommentVariableInstanceTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
index 669ea7c07734..000bc6f616ea 100644
--- a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
+++ b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Migrate contact categories to contact.form.*.yml.
  *
- * @group contact
+ * @group migrate_drupal_6
  */
 class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php
index 9f9e67325793..2f17e9214f7c 100644
--- a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php
+++ b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to contact.settings.yml.
  *
- * @group contact
+ * @group migrate_drupal_6
  */
 class MigrateContactConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php b/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php
index 4fb4a763e534..f28ae45e93ab 100644
--- a/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php
+++ b/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to dblog.settings.yml.
  *
- * @group dblog
+ * @group migrate_drupal_6
  */
 class MigrateDblogConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php
index 9198d06b1a21..c9e99129fae4 100644
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php
+++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade field formatter settings to entity.display.*.*.yml.
  *
- * @group field
+ * @group migrate_drupal_6
  */
 class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php
index 61bf944a6d75..2b04399faff8 100644
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php
+++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php
@@ -14,7 +14,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Migrate field instances.
  *
- * @group field
+ * @group migrate_drupal_6
  */
 class MigrateFieldInstanceTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php
index 30ce60a59284..1ef907ddbbe7 100644
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php
+++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Migrate fields.
  *
- * @group field
+ * @group migrate_drupal_6
  */
 class MigrateFieldTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php
index 37586a2dd0f8..0b2c0e88099d 100644
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php
+++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Migrate field widget settings.
  *
- * @group field
+ * @group migrate_drupal_6
  */
 class MigrateFieldWidgetSettingsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php
index c78c8b7d85b2..25a47bc7ec31 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php
+++ b/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to file.settings.yml.
  *
- * @group file
+ * @group migrate_drupal_6
  */
 class MigrateFileConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php
index 2f68b2da0d2d..18274fd8f6ca 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php
+++ b/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php
@@ -17,7 +17,7 @@ use Drupal\file\Entity\File;
 /**
  * file migration.
  *
- * @group file
+ * @group migrate_drupal_6
  */
 class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlterInterface {
 
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php
index 83eb0af04fd0..81af19854448 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php
+++ b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upload entity display.
  *
- * @group file
+ * @group migrate_drupal_6
  */
 class MigrateUploadEntityDisplayTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
index 6023f511e4de..1ca5e2f488f5 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
+++ b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upload form entity display.
  *
- * @group file
+ * @group migrate_drupal_6
  */
 class MigrateUploadEntityFormDisplayTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadFieldTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadFieldTest.php
index 0d8b4a6f9feb..38cadb80f21a 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadFieldTest.php
+++ b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadFieldTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Uploads migration.
  *
- * @group file
+ * @group migrate_drupal_6
  */
 class MigrateUploadFieldTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php
index 998912a8c218..7a30fce5b398 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php
+++ b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upload field instance migration.
  *
- * @group file
+ * @group migrate_drupal_6
  */
 class MigrateUploadInstanceTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadTest.php
index c5451139174c..11e91b1887da 100644
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadTest.php
+++ b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadTest.php
@@ -12,7 +12,7 @@ use Drupal\node\Entity\Node;
 /**
  * Migrate association data between nodes and files.
  *
- * @group file
+ * @group migrate_drupal_6
  */
 class MigrateUploadTest extends MigrateUploadBase {
 
diff --git a/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php b/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php
index ac5e1ce5524d..febea32b1ad7 100644
--- a/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php
+++ b/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to filter.formats.*.yml.
  *
- * @group filter
+ * @group migrate_drupal_6
  */
 class MigrateFilterFormatTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php b/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php
index 806253848d7f..0f3c22bcd5a1 100644
--- a/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php
+++ b/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to forum.settings.yml.
  *
- * @group forum
+ * @group migrate_drupal_6
  */
 class MigrateForumConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php b/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php
index ceb34cde5e2f..f638f327a44c 100644
--- a/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php
+++ b/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to locale.settings.yml.
  *
- * @group locale
+ * @group migrate_drupal_6
  */
 class MigrateLocaleConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php b/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php
index 94971ca77811..b9fb56574c08 100644
--- a/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php
+++ b/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Menu link migration.
  *
- * @group menu_link_content
+ * @group migrate_drupal_6
  */
 class MigrateMenuLinkTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
index acbb24b1a723..bccd7409a3a3 100644
--- a/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
@@ -16,17 +16,11 @@ use Drupal\simpletest\TestBase;
 abstract class MigrateFullDrupalTestBase extends MigrateDrupalTestBase {
 
   /**
-   * The test class which discovered migration tests must extend in order to be
-   * included in this test run.
-   */
-  const BASE_TEST_CLASS = 'Drupal\migrate_drupal\Tests\MigrateDrupalTestBase';
-
-  /**
-   * A list of fully-qualified test classes which should be ignored.
+   * The group to which tests should belong in order for this test to run them.
    *
-   * @var string[]
+   * @var string
    */
-  protected static $blacklist = [];
+  const TEST_GROUP = '';
 
   /**
    * Get the test classes that needs to be run for this test.
@@ -35,20 +29,8 @@ abstract class MigrateFullDrupalTestBase extends MigrateDrupalTestBase {
    *   The list of fully-classified test class names.
    */
   protected function getTestClassesList() {
-    $classes = [];
-
-    $discovery = \Drupal::getContainer()->get('test_discovery');
-    foreach (static::$modules as $module) {
-      foreach ($discovery->getTestClasses($module) as $group) {
-        foreach (array_keys($group) as $class) {
-          if (is_subclass_of($class, static::BASE_TEST_CLASS)) {
-            $classes[] = $class;
-          }
-        }
-      }
-    }
-    // Exclude blacklisted classes.
-    return array_diff($classes, static::$blacklist);
+    $groups = \Drupal::getContainer()->get('test_discovery')->getTestClasses();
+    return isset($groups[static::TEST_GROUP]) ? array_keys($groups[static::TEST_GROUP]) : [];
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php
index 9ac6d26e4a89..6b1e8cb3a1f3 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php
@@ -13,7 +13,7 @@ use Drupal\node\Tests\Migrate\d6\MigrateNodeTestBase;
 /**
  * CCK field revision migration.
  *
- * @group migrate_drupal
+ * @group migrate_drupal_6
  */
 class MigrateCckFieldRevisionTest extends MigrateNodeTestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
index d16b1d3a22e5..734e61a51967 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
@@ -14,7 +14,7 @@ use Drupal\node\Tests\Migrate\d6\MigrateNodeTestBase;
 /**
  * CCK field content migration.
  *
- * @group migrate_drupal
+ * @group migrate_drupal_6
  */
 class MigrateCckFieldValuesTest extends MigrateNodeTestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
index b6ae809f6a47..551b70d2c3c4 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
@@ -17,11 +17,7 @@ use Drupal\user\Entity\User;
  */
 class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
 
-  const BASE_TEST_CLASS = 'Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase';
-
-  protected static $blacklist = array(
-    'Drupal\migrate_drupal\Tests\dependencies\MigrateDependenciesTest',
-  );
+  const TEST_GROUP = 'migrate_drupal_6';
 
   /**
    * Modules to enable.
@@ -52,6 +48,7 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
     'migrate_drupal',
     'node',
     'options',
+    'path',
     'search',
     'system',
     'simpletest',
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php
index d19061b79dd3..cba397f4117b 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php
@@ -10,7 +10,7 @@ namespace Drupal\node\Tests\Migrate\d6;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
- * @group node
+ * @group migrate_drupal_6
  */
 class MigrateNodeBuilderTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php
index 454040d8a32d..a5e2724d04e9 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Test migrating node settings into the base_field_bundle_override config entity.
  *
- * @group node
+ * @group migrate_drupal_6
  */
 class MigrateNodeBundleSettingsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php
index af540f768c15..1d68ed2a14af 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to node.settings.yml.
  *
- * @group node
+ * @group migrate_drupal_6
  */
 class MigrateNodeConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
index 27a5dcd307f2..7b1950899cbb 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
@@ -12,7 +12,7 @@ use Drupal\Core\Database\Database;
 /**
  * Node content revisions migration.
  *
- * @group node
+ * @group migrate_drupal_6
  */
 class MigrateNodeRevisionTest extends MigrateNodeTestBase {
 
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php
index ab27ac8a03f0..8b0b534b130e 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php
@@ -14,7 +14,7 @@ use Drupal\node\Entity\Node;
 /**
  * Node content migration.
  *
- * @group node
+ * @group migrate_drupal_6
  */
 class MigrateNodeTest extends MigrateNodeTestBase {
 
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php
index f7c5832d796d..e7956ef4e028 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php
@@ -14,7 +14,7 @@ use Drupal\node\Entity\NodeType;
 /**
  * Upgrade node types to node.type.*.yml.
  *
- * @group node
+ * @group migrate_drupal_6
  */
 class MigrateNodeTypeTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php
index 310a0c9e7844..e9fc2789985d 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Migrate view modes.
  *
- * @group node
+ * @group migrate_drupal_6
  */
 class MigrateViewModesTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php b/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php
index bf08192ce48a..c02ee75858fa 100644
--- a/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php
+++ b/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php
@@ -15,7 +15,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Url alias migration.
  *
- * @group path
+ * @group migrate_drupal_6
  */
 class MigrateUrlAliasTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
index c330d2f4df5f..4a07223764d0 100644
--- a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
+++ b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
@@ -14,7 +14,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade search rank settings to search.page.*.yml.
  *
- * @group search
+ * @group migrate_drupal_6
  */
 class MigrateSearchPageTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php
index d872d160e661..29cd17ccb9f5 100644
--- a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php
+++ b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to search.settings.yml.
  *
- * @group search
+ * @group migrate_drupal_6
  */
 class MigrateSearchSettingsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php b/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php
index 43344dc0275f..78a15d85ec23 100644
--- a/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php
+++ b/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to simpletest.settings.yml.
  *
- * @group simpletest
+ * @group migrate_drupal_6
  */
 class MigrateSimpletestConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php b/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php
index 9a0a9d2ce29a..4e845c278d0b 100644
--- a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php
+++ b/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to statistics.settings.yml.
  *
- * @group statistics
+ * @group migrate_drupal_6
  */
 class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php b/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php
index 0ed8593613d4..4f546ba39f44 100644
--- a/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php
+++ b/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to syslog.settings.yml.
  *
- * @group syslog
+ * @group migrate_drupal_6
  */
 class MigrateSyslogConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php
index 8ba6c95fd359..0369c894987c 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php
@@ -14,7 +14,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade date formats to core.date_format.*.yml.
  *
- * @group system
+ * @group migrate_drupal_6
  */
 class MigrateDateFormatTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateMenuTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateMenuTest.php
index b868f2a28972..d70b48458b72 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateMenuTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateMenuTest.php
@@ -15,7 +15,7 @@ use Drupal\system\Entity\Menu;
 /**
  * Upgrade menus to system.menu.*.yml.
  *
- * @group system
+ * @group migrate_drupal_6
  */
 class MigrateMenuTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
index 77831b0349ba..97c11705b030 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade cron variable to system.*.yml.
  *
- * @group system
+ * @group migrate_drupal_6
  */
 class MigrateSystemCronTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
index 6b7e0c2f956e..e0ffc342524c 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to system.*.yml.
  *
- * @group system
+ * @group migrate_drupal_6
  */
 class MigrateSystemFileTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
index 57f30a49bae8..bc41d5286f42 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade image gd variables to system.*.yml.
  *
- * @group system
+ * @group migrate_drupal_6
  */
 class MigrateSystemImageGdTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
index a2e5d80e58df..c297ad12b46a 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade image variables to system.*.yml.
  *
- * @group system
+ * @group migrate_drupal_6
  */
 class MigrateSystemImageTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
index c3529100e32d..eba3d51c09ec 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade error_level variable to system.logging.yml.
  *
- * @group system
+ * @group migrate_drupal_6
  */
 class MigrateSystemLoggingTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
index 82ea4831cfa8..dd3372fdb028 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade maintenance variables to system.*.yml.
  *
- * @group system
+ * @group migrate_drupal_6
  */
 class MigrateSystemMaintenanceTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
index f6defe941bc2..6b2ebc2d186c 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade performance variables to system.*.yml.
  *
- * @group system
+ * @group migrate_drupal_6
  */
 class MigrateSystemPerformanceTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
index 21b04c2bf7e5..3e5928946240 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade rss variable to system.*.yml.
  *
- * @group system
+ * @group migrate_drupal_6
  */
 class MigrateSystemRssTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
index 2b68764d91b5..46596c9406d2 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade site variables to system.*.yml.
  *
- * @group system
+ * @group migrate_drupal_6
  */
 class MigrateSystemSiteTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyConfigsTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyConfigsTest.php
index ef17ea6e3eeb..d2122752949c 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyConfigsTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to taxonomy.settings.yml.
  *
- * @group taxonomy
+ * @group migrate_drupal_6
  */
 class MigrateTaxonomyConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php
index eefcceb9c68c..e21d04de4023 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade taxonomy terms.
  *
- * @group taxonomy
+ * @group migrate_drupal_6
  */
 class MigrateTaxonomyTermTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php
index af2fdbaf95b0..6cbbce12ed89 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Migrate taxonomy vocabularies to taxonomy.vocabulary.*.yml.
  *
- * @group taxonomy
+ * @group migrate_drupal_6
  */
 class MigrateTaxonomyVocabularyTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php
index 60e8e10e8adb..3cd55d22593c 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate\MigrateExecutable;
 /**
  * Upgrade taxonomy term node associations.
  *
- * @group taxonomy
+ * @group migrate_drupal_6
  */
 class MigrateTermNodeRevisionTest extends MigrateTermNodeTestBase {
 
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php
index 2173c5920a8e..6dd5dfd33ca3 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php
@@ -13,7 +13,7 @@ use Drupal\node\Entity\Node;
 /**
  * Upgrade taxonomy term node associations.
  *
- * @group taxonomy
+ * @group migrate_drupal_6
  */
 class MigrateTermNodeTest extends MigrateTermNodeTestBase {
 
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
index bcf6b69865a9..7e6c3f5ed11d 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Vocabulary entity display migration.
  *
- * @group taxonomy
+ * @group migrate_drupal_6
  */
 class MigrateVocabularyEntityDisplayTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
index 80efa090c451..db31790f7f94 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Vocabulary entity form display migration.
  *
- * @group taxonomy
+ * @group migrate_drupal_6
  */
 class MigrateVocabularyEntityFormDisplayTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
index f5c02ad54090..adce33de160a 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
@@ -14,7 +14,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Vocabulary field instance migration.
  *
- * @group taxonomy
+ * @group migrate_drupal_6
  */
 class MigrateVocabularyFieldInstanceTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php
index 0c588c894c0d..a88eed0d788b 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Vocabulary field migration.
  *
- * @group taxonomy
+ * @group migrate_drupal_6
  */
 class MigrateVocabularyFieldTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php b/core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php
index 0fbc1e9c9210..073976ef2c47 100644
--- a/core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php
+++ b/core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to text.settings.yml.
  *
- * @group text
+ * @group migrate_drupal_6
  */
 class MigrateTextConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php b/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
index fedf1829c6f4..da1d4ee5f487 100644
--- a/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
+++ b/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to update.settings.yml.
  *
- * @group update
+ * @group migrate_drupal_6
  */
 class MigrateUpdateConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php
index a087bbd137b1..b9589430d0a5 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade variables to user.*.yml.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php
index dec01537f513..96dddaef0d4c 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Users contact settings migration.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserContactSettingsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityDisplayTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityDisplayTest.php
index 4e763570bb1d..ca18375f9995 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityDisplayTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityDisplayTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * User picture entity display.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserPictureEntityDisplayTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityFormDisplayTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityFormDisplayTest.php
index 868977b4b28f..05c357517cda 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityFormDisplayTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityFormDisplayTest.php
@@ -12,7 +12,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * User picture entity form display.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserPictureEntityFormDisplayTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFieldTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFieldTest.php
index d3c1acb309bb..ace1a35ab57b 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFieldTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFieldTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * User picture field migration.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserPictureFieldTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
index 54a84566603b..2e1d42890c75 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * User pictures migration.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserPictureFileTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureInstanceTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureInstanceTest.php
index 45813ad6594b..a4219fd31156 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureInstanceTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureInstanceTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * User picture field instance migration.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserPictureInstanceTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityDisplayTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityDisplayTest.php
index 059230f9a1c3..e97b0e0e7cd8 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityDisplayTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityDisplayTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Tests the user profile entity display migration.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserProfileEntityDisplayTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityFormDisplayTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityFormDisplayTest.php
index 0adb0619b2da..ea3dc2359a01 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityFormDisplayTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityFormDisplayTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Tests the user profile entity form display migration.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserProfileEntityFormDisplayTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldInstanceTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldInstanceTest.php
index e4bbee16a029..eb456179777d 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldInstanceTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldInstanceTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Tests the user profile field instance migration.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserProfileFieldInstanceTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldTest.php
index 12bb0a2a091a..356efc23c39d 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Tests the user profile field migration.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserProfileFieldTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php
index f07b919fa25d..d44f7376aa9c 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php
@@ -14,7 +14,7 @@ use Drupal\user\Entity\User;
 /**
  * User profile values migration.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserProfileValuesTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php
index caf1ca9e4a1f..4b86da28b196 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php
@@ -13,7 +13,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Upgrade user roles to user.role.*.yml.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserRoleTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
index 7fa3236877a8..15368ab6d83e 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
@@ -16,7 +16,7 @@ use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 /**
  * Users migration.
  *
- * @group user
+ * @group migrate_drupal_6
  */
 class MigrateUserTest extends MigrateDrupal6TestBase {