diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
index 7d73daf..9796bb1 100644
--- a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
@@ -43,12 +43,12 @@ protected function setUp() {
 
     // Prepare to migrate user pictures as well.
     $this->installEntitySchema('file');
-    $this->createType('page');
-    $this->createType('article');
-    $this->createType('blog');
-    $this->createType('book');
-    $this->createType('forum');
-    $this->createType('test_content_type');
+    $this->createType('page', 'comment_node_page');
+    $this->createType('article', 'comment');
+    $this->createType('blog', 'comment_node_blog');
+    $this->createType('book', 'comment_node_book');
+    $this->createType('forum', 'comment_forum');
+    $this->createType('test_content_type', 'comment_node_test_content_type');
     Vocabulary::create(['vid' => 'test_vocabulary'])->save();
     $this->executeMigrations([
       'language',
@@ -67,14 +67,14 @@ protected function setUp() {
    * @param string $id
    *   The node type ID.
    */
-  protected function createType($id) {
+  protected function createType($node_type, $comment_type) {
     NodeType::create([
-      'type' => $id,
+      'type' => $node_type,
       'label' => $this->randomString(),
     ])->save();
 
     CommentType::create([
-      'id' => 'comment_node_' . $id,
+      'id' => $comment_type,
       'label' => $this->randomString(),
       'target_entity_type_id' => 'node',
     ])->save();