diff --git a/core/modules/migrate/tests/modules/migrate_high_water_test/migrate_high_water_test.info.yml b/core/modules/migrate/tests/modules/migrate_high_water_test/migrate_high_water_test.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0a995c85b20d84a8660ddc921feccce233e264b7
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_high_water_test/migrate_high_water_test.info.yml
@@ -0,0 +1,7 @@
+type: module
+name: Migration High Water Test
+description: 'Provides test fixtures for testing high water marks.'
+package: Testing
+core: 8.x
+dependencies:
+  - migrate
diff --git a/core/modules/migrate/tests/modules/migrate_high_water_test/migrate_sql_test.info.yml b/core/modules/migrate/tests/modules/migrate_high_water_test/migrate_sql_test.info.yml
deleted file mode 100644
index 23cd53c6b7ab8fa73dd2a4bb05e8ebf200baf87f..0000000000000000000000000000000000000000
--- a/core/modules/migrate/tests/modules/migrate_high_water_test/migrate_sql_test.info.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-type: module
-name: Migrate SQL Source test
-description: 'Provides a database table and records for SQL import testing.'
-package: Testing
-core: 8.x
-dependencies:
-  - migrate
diff --git a/core/modules/migrate/tests/modules/migrate_high_water_test/src/Plugin/migrate/source/HighWaterTest.php b/core/modules/migrate/tests/modules/migrate_high_water_test/src/Plugin/migrate/source/HighWaterTest.php
index c4af3362b636588ba29b7774295259d910c74292..83767211830ebe6f474bc5a785c7bf08893ec7b8 100644
--- a/core/modules/migrate/tests/modules/migrate_high_water_test/src/Plugin/migrate/source/HighWaterTest.php
+++ b/core/modules/migrate/tests/modules/migrate_high_water_test/src/Plugin/migrate/source/HighWaterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\migrate_sql_test\Plugin\migrate\source;
+namespace Drupal\migrate_high_water_test\Plugin\migrate\source;
 
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
 
diff --git a/core/modules/migrate/tests/src/Kernel/HighWaterNotJoinableTest.php b/core/modules/migrate/tests/src/Kernel/HighWaterNotJoinableTest.php
index b8d2a24df267582b07055018bed99dca9430275f..72edcd00457a4947c18268dfd2d65d0954d664e1 100644
--- a/core/modules/migrate/tests/src/Kernel/HighWaterNotJoinableTest.php
+++ b/core/modules/migrate/tests/src/Kernel/HighWaterNotJoinableTest.php
@@ -5,7 +5,7 @@
 /**
  * Tests the high water handling.
  *
- * @covers \Drupal\migrate_sql_test\Plugin\migrate\source\HighWaterTest
+ * @covers \Drupal\migrate_high_water_test\Plugin\migrate\source\HighWaterTest
  * @group migrate
  */
 class HighWaterNotJoinableTest extends MigrateSqlSourceTestBase {
@@ -13,7 +13,7 @@ class HighWaterNotJoinableTest extends MigrateSqlSourceTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['migrate', 'migrate_drupal', 'migrate_sql_test'];
+  public static $modules = ['migrate', 'migrate_drupal', 'migrate_high_water_test'];
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/migrate/tests/src/Kernel/HighWaterTest.php b/core/modules/migrate/tests/src/Kernel/HighWaterTest.php
index 952acd82e25f9ab9ae01065dcde661bb045ae223..faffb663585cd8337481ab76fdb339eca63a06b3 100644
--- a/core/modules/migrate/tests/src/Kernel/HighWaterTest.php
+++ b/core/modules/migrate/tests/src/Kernel/HighWaterTest.php
@@ -17,7 +17,7 @@ class HighWaterTest extends MigrateTestBase {
     'user',
     'node',
     'migrate',
-    'migrate_sql_test',
+    'migrate_high_water_test',
     'field',
   ];