diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldInstanceTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldInstanceTest.php
index 27d2a7e4d5..93610e9d11 100644
--- a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldInstanceTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldInstanceTest.php
@@ -71,12 +71,12 @@ protected function assertEntity($bundle, $field_name, $default_value, $default_m
    * Tests the migrated fields.
    */
   public function testMigration() {
-    $this->assertEntity('page','comment_node_page', 0, 1, 50, 0, TRUE, 1);
-    $this->assertEntity('article','comment_node_article', 2, 1, 50, 0, TRUE, 1);
-    $this->assertEntity('blog','comment_node_blog', 2, 1, 50, 0, TRUE, 1);
-    $this->assertEntity('book','comment_node_book', 2, 1, 50, 0, TRUE, 1);
-    $this->assertEntity('forum','comment_node_forum', 2, 1, 50, 0, TRUE, 1);
-    $this->assertEntity('test_content_type','comment_node_test_content_type', 2, 1, 30, 0, TRUE, 1);
+    $this->assertEntity('page', 'comment_node_page', 0, 1, 50, 0, TRUE, 1);
+    $this->assertEntity('article', 'comment_node_article', 2, 1, 50, 0, TRUE, 1);
+    $this->assertEntity('blog', 'comment_node_blog', 2, 1, 50, 0, TRUE, 1);
+    $this->assertEntity('book', 'comment_node_book', 2, 1, 50, 0, TRUE, 1);
+    $this->assertEntity('forum', 'comment_node_forum', 2, 1, 50, 0, TRUE, 1);
+    $this->assertEntity('test_content_type', 'comment_node_test_content_type', 2, 1, 30, 0, TRUE, 1);
   }
 
 }
diff --git a/core/modules/comment/tests/src/Kernel/Plugin/migrate/source/d7/CommentTypeTest.php b/core/modules/comment/tests/src/Kernel/Plugin/migrate/source/d7/CommentTypeTest.php
deleted file mode 100644
index 11f3db5842..0000000000
--- a/core/modules/comment/tests/src/Kernel/Plugin/migrate/source/d7/CommentTypeTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace Drupal\Tests\comment\Kernel\Plugin\migrate\source\d7;
-
-use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
-
-/**
- * Tests D7 comment type source plugin.
- *
- * @covers \Drupal\comment\Plugin\migrate\source\d7\CommentType
- * @group comment
- */
-class CommentTypeTest extends MigrateSqlSourceTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['comment', 'migrate_drupal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function providerSource() {
-    $tests = [];
-
-    // The source data.
-    $tests[0]['source_data']['node_type'] = [
-      [
-        'type' => 'article',
-        'name' => 'Article',
-        'base' => 'node_content',
-        'module' => 'node',
-        'description' => 'Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.',
-        'help' => 'Help text for articles',
-        'has_title' => '1',
-        'title_label' => 'Title',
-        'custom' => '1',
-        'modified' => '1',
-        'locked' => '0',
-        'disabled' => '0',
-        'orig_type' => 'article',
-      ],
-    ];
-    $tests[0]['source_data']['field_config_instance'] = [
-      [
-        'id' => '14',
-        'field_id' => '1',
-        'field_name' => 'comment_body',
-        'entity_type' => 'comment',
-        'bundle' => 'comment_node_article',
-        'data' => 'a:0:{}',
-        'deleted' => '0',
-      ],
-    ];
-    $tests[0]['source_data']['variable'] = [
-      [
-        'name' => 'comment_default_mode_article',
-        'value' => serialize(1),
-      ],
-      [
-        'name' => 'comment_per_page_article',
-        'value' => serialize(50),
-      ],
-      [
-        'name' => 'comment_anonymous_article',
-        'value' => serialize(0),
-      ],
-      [
-        'name' => 'comment_form_location_article',
-        'value' => serialize(1),
-      ],
-      [
-        'name' => 'comment_preview_article',
-        'value' => serialize(0),
-      ],
-      [
-        'name' => 'comment_subject_article',
-        'value' => serialize(1),
-      ],
-    ];
-
-    // The expected results.
-    $tests[0]['expected_data'] = [
-      [
-        'bundle' => 'comment_node_article',
-        'node_type' => 'article',
-        'default_mode' => '1',
-        'per_page' => '50',
-        'anonymous' => '0',
-        'form_location' => '1',
-        'preview' => '0',
-        'subject' => '1',
-        'label' => 'Article comment',
-      ],
-    ];
-    return $tests;
-  }
-
-}