diff --git a/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalCreateTestContentTrait.php b/core/modules/migrate_drupal/tests/src/CreateTestContentEntitiesTrait.php
similarity index 84%
rename from core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalCreateTestContentTrait.php
rename to core/modules/migrate_drupal/tests/src/CreateTestContentEntitiesTrait.php
index cb33c00c76..877d338f1e 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalCreateTestContentTrait.php
+++ b/core/modules/migrate_drupal/tests/src/CreateTestContentEntitiesTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\migrate_drupal\Kernel;
+namespace Drupal\Tests\migrate_drupal;
 
 use Drupal\aggregator\Entity\Feed;
 use Drupal\aggregator\Entity\Item;
@@ -15,7 +15,31 @@
 /**
  * Provides helper methods for creating test content.
  */
-trait MigrateDrupalCreateTestContentTrait {
+trait CreateTestContentEntitiesTrait {
+
+  /**
+   * Gets required modules.
+   *
+   * @return array
+   */
+  protected function getRequiredModules() {
+    return [
+      'aggregator',
+      'block_content',
+      'comment',
+      'field',
+      'file',
+      'link',
+      'menu_link_content',
+      'migrate_drupal',
+      'node',
+      'options',
+      'system',
+      'taxonomy',
+      'text',
+      'user',
+    ];
+  }
 
   /**
    * Install required entity schemas.
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php
index 65fc0535d8..5a5ced01e4 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php
@@ -6,7 +6,7 @@
 use Drupal\migrate\Audit\AuditResult;
 use Drupal\migrate\Audit\IdAuditor;
 use Drupal\node\Entity\Node;
-use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalCreateTestContentTrait;
+use Drupal\Tests\migrate_drupal\Kernel\CreateTestContentEntitiesTrait;
 
 /**
  * Tests the migration auditor for ID conflicts.
@@ -16,7 +16,7 @@
 class MigrateDrupal6AuditIdsTest extends MigrateDrupal6TestBase {
 
   use FileSystemModuleDiscoveryDataProviderTrait;
-  use MigrateDrupalCreateTestContentTrait;
+  use CreateTestContentEntitiesTrait;
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php
index 28ef9a8f0f..526a38e10a 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php
@@ -6,7 +6,7 @@
 use Drupal\migrate\Audit\AuditResult;
 use Drupal\migrate\Audit\IdAuditor;
 use Drupal\node\Entity\Node;
-use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalCreateTestContentTrait;
+use Drupal\Tests\migrate_drupal\Kernel\CreateTestContentEntitiesTrait;
 
 /**
  * Tests the migration auditor for ID conflicts.
@@ -16,7 +16,7 @@
 class MigrateDrupal7AuditIdsTest extends MigrateDrupal7TestBase {
 
   use FileSystemModuleDiscoveryDataProviderTrait;
-  use MigrateDrupalCreateTestContentTrait;
+  use CreateTestContentEntitiesTrait;
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
index 9ad7a38a89..cbf12bd88a 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
@@ -6,7 +6,7 @@
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate_drupal\MigrationConfigurationTrait;
 use Drupal\Tests\BrowserTestBase;
-use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalCreateTestContentTrait;
+use Drupal\Tests\migrate_drupal\Kernel\CreateTestContentEntitiesTrait;
 
 /**
  * Provides a base class for testing migration upgrades in the UI.
@@ -14,7 +14,7 @@
 abstract class MigrateUpgradeTestBase extends BrowserTestBase {
 
   use MigrationConfigurationTrait;
-  use MigrateDrupalCreateTestContentTrait;
+  use CreateTestContentEntitiesTrait;
 
   /**
    * Use the Standard profile to test help implementations of many core modules.