diff --git a/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrations/migrate.migration.migrations_test.yml b/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrations/migrate.migration.migrations_test.yml
deleted file mode 100644
index 4947b13c6f..0000000000
--- a/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrations/migrate.migration.migrations_test.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-id: migrations_test
-label: Migration templates test
-source:
-  plugin: embedded_data
-  data_rows:
-    -
-      id: basic
-  ids:
-    id:
-      type: string
-  source_module: block
-process:
-  id: id
-destination:
-  plugin: null
diff --git a/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrations_not_found/migrate.migration.migrations_not_found_test.yml b/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrations_not_found/migrate.migration.migrations_not_found_test.yml
deleted file mode 100644
index 094df667dd..0000000000
--- a/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrations_not_found/migrate.migration.migrations_not_found_test.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-id: migrations_not_found_test
-label: Migration templates test
-source:
-  plugin: embedded_data
-  data_rows:
-    -
-      id: basic
-  ids:
-    id:
-      type: string
-  source_module: block
-process:
-  id: id
-destination:
-  plugin: null
diff --git a/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrate_migration_directory_test.info.yml b/core/modules/migrate/tests/modules/migration_directory_test/migration_directory_test.info.yml
similarity index 100%
rename from core/modules/migrate/tests/modules/migrate_migration_directory_test/migrate_migration_directory_test.info.yml
rename to core/modules/migrate/tests/modules/migration_directory_test/migration_directory_test.info.yml
diff --git a/core/modules/migrate/tests/modules/migrate_migration_directory_test/migration_templates/migrate.migration.migration_templates_test.yml b/core/modules/migrate/tests/modules/migration_directory_test/migration_templates/migration_templates_test.yml
similarity index 100%
rename from core/modules/migrate/tests/modules/migrate_migration_directory_test/migration_templates/migrate.migration.migration_templates_test.yml
rename to core/modules/migrate/tests/modules/migration_directory_test/migration_templates/migration_templates_test.yml
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationDirectoryTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationDirectoryTest.php
index 969a64aa39..11893b6342 100644
--- a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationDirectoryTest.php
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationDirectoryTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\migrate\Kernel\Plugin;
 
-use Drupal\migrate\Plugin\Migration;
 use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 
 /**
@@ -15,24 +14,16 @@ class MigrationDirectoryTest extends MigrateDrupalTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['migrate_migration_directory_test'];
+  public static $modules = ['migration_directory_test'];
 
   /**
    * Tests that migrations in the migration_templates directory are created.
    */
   public function testMigrationDirectory() {
-
     /** @var \Drupal\migrate\Plugin\MigrationPluginManager $plugin_manager */
     $plugin_manager = $this->container->get('plugin.manager.migration');
-    // Tests a migration in 'migration_templates' is created.
-    $migration = $plugin_manager->createInstance('migration_templates_test');
-    $this->assertInstanceOf(Migration::class, $migration);
-    // Tests a migration in 'migrations' is created.
-    $migration = $plugin_manager->createInstance('migrations_test');
-    $this->assertInstanceOf(Migration::class, $migration);
-    // Tests a migration in 'migrations_not_found' is not created.
-    $migration = $plugin_manager->createInstance('migration_not_found_test');
-    $this->assertFalse($migration);
+    // Tests that a migration in directory 'migration_templates' is discovered.
+    $this->assertTrue($plugin_manager->hasDefinition('migration_templates_test'));
   }
 
 }