diff --git a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/migrate_cckfield_plugin_manager_test.module b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/migrate_cckfield_plugin_manager_test.module
index 2236781..0cb89be 100644
--- a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/migrate_cckfield_plugin_manager_test.module
+++ b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/migrate_cckfield_plugin_manager_test.module
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Module for Migrate Field Plugin Manager testing.
+ * Module for Migrate CCK Field Plugin Manager testing.
  */
 
 use Drupal\migrate_cckfield_plugin_manager_test\Plugin\migrate\cckfield\D6FileField;
 
-function migrate_field_plugin_manager_test_migrate_field_info_alter(array &$definitions) {
+function migrate_cckfield_plugin_manager_test_migrate_field_info_alter(array &$definitions) {
   if (isset($definitions['filefield'])) {
     $definitions['filefield']['class'] = D6FileField::class;
   }
diff --git a/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php b/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php
index 5e60573..d550b40 100644
--- a/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php
+++ b/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\text\Unit\Migrate;
+namespace Drupal\Tests\text\Unit\Migrate\d6;
 
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
@@ -9,7 +9,7 @@
 use Prophecy\Argument;
 
 /**
- * @coversDefaultClass \Drupal\text\Plugin\migrate\field\TextField
+ * @coversDefaultClass \Drupal\text\Plugin\migrate\field\d6\TextField
  * @group text
  * @group legacy
  */
diff --git a/core/modules/text/tests/src/Unit/Migrate/d7/TextFieldTest.php b/core/modules/text/tests/src/Unit/Migrate/d7/TextFieldTest.php
index e69de29..5f7622f 100644
--- a/core/modules/text/tests/src/Unit/Migrate/d7/TextFieldTest.php
+++ b/core/modules/text/tests/src/Unit/Migrate/d7/TextFieldTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Drupal\Tests\text\Unit\Migrate\d7;
+
+use Drupal\Tests\text\Unit\Migrate\d6\TextFieldTest as D6TextFieldTest;
+
+/**
+ * @coversDefaultClass \Drupal\text\Plugin\migrate\field\d7\TextField
+ * @group text
+ * @group legacy
+ */
+class TextFieldTest extends D6TextFieldTest {}