diff --git a/core/modules/migrate/tests/src/Kernel/NodeCommentCombinationTrait.php b/core/modules/migrate/tests/src/Kernel/NodeCommentCombinationTrait.php
index 0737493..e2fcd9e 100644
--- a/core/modules/migrate/tests/src/Kernel/NodeCommentCombinationTrait.php
+++ b/core/modules/migrate/tests/src/Kernel/NodeCommentCombinationTrait.php
@@ -8,6 +8,9 @@
  *   instead.
  */
 
+use Drupal\comment\Entity\CommentType;
+use Drupal\node\Entity\NodeType;
+
 /**
  * Provides methods for testing node and comment combinations.
  */
@@ -24,6 +27,20 @@
    */
   protected function createNodeCommentCombination($node_type, $comment_type = NULL) {
     @trigger_error('NodeCommentCombinationTrait::createNodeCommentCombination() is deprecated in Drupal 8.7.x, will be removed before Drupal 9.0.0. Use \Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase::migrateFields() instead.', E_USER_DEPRECATED);
+
+    if (!$comment_type) {
+      $comment_type = "comment_node_$node_type";
+    }
+    NodeType::create([
+      'type' => $node_type,
+      'label' => $this->randomString(),
+    ])->save();
+
+    CommentType::create([
+      'id' => $comment_type,
+      'label' => $this->randomString(),
+      'target_entity_type_id' => 'node',
+    ])->save();
   }
 
 }