diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
index 449c8c972fae1bdc072e8ff974d474144d2a1817..2ac3e2ed36eeb5ca0de2f25455c4863490583f8b 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
@@ -81,12 +81,6 @@ public function testMigrateUpgradeExecute() {
     $session->pageTextContains('Resolve all issues below to continue the upgrade.');
 
     $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
-    // Ensure we get errors about missing modules.
-    $session->pageTextContains(t('Resolve all issues below to continue the upgrade.'));
-    $session->pageTextContains(t('The no_source_module plugin must define the source_module property.'));
-
-    // Uninstall the module causing the missing module error messages.
-    $this->container->get('module_installer')->uninstall(['migration_provider_test'], TRUE);
 
     // Test the file sources.
     $this->drupalGet('/upgrade');
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/SourceProviderTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/SourceProviderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac6b491eb82ccc16455cf8e01166893082f1eae2
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/SourceProviderTest.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace Drupal\Tests\migrate_drupal_ui\Functional;
+
+/**
+ * Tests that a missing source provider error message is displayed.
+ *
+ * @group migrate_drupal_ui
+ */
+class SourceProviderTest extends MigrateUpgradeTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'migrate_drupal_ui',
+    // Will generate an error for a missing source module.
+    'migration_provider_test',
+  ];
+
+  /**
+   * Test missing source provider.
+   *
+   * @dataProvider providerSourceProvider
+   */
+  public function testSourceProvider($path_to_database) {
+    $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . $path_to_database);
+
+    $session = $this->assertSession();
+    $connection_options = $this->sourceDatabase->getConnectionOptions();
+    $driver = $connection_options['driver'];
+    $connection_options['prefix'] = $connection_options['prefix']['default'];
+    // Use the driver connection form to get the correct options out of the
+    // database settings. This supports all of the databases we test against.
+    $drivers = drupal_get_database_types();
+    $form = $drivers[$driver]->getFormOptions($connection_options);
+    $connection_options = array_intersect_key($connection_options, $form + $form['advanced_options']);
+    $version = $this->getLegacyDrupalVersion($this->sourceDatabase);
+    $edit = [
+      $driver => $connection_options,
+      'source_private_file_path' => $this->getSourceBasePath(),
+      'version' => $version,
+    ];
+    if ($version == 6) {
+      $edit['d6_source_base_path'] = $this->getSourceBasePath();
+    }
+    else {
+      $edit['source_base_path'] = $this->getSourceBasePath();
+    }
+    if (count($drivers) !== 1) {
+      $edit['driver'] = $driver;
+    }
+    $edits = $this->translatePostValues($edit);
+
+    // Start the upgrade.
+    $this->drupalGet('/upgrade');
+    [$new_site_version] = explode('.', \Drupal::VERSION, 2);
+    $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $new_site_version.");
+    $this->drupalPostForm(NULL, [], t('Continue'));
+    $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
+    $session->fieldExists('mysql[host]');
+    $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
+
+    // Ensure we get errors about missing modules.
+    $session->pageTextContains(t('Resolve all issues below to continue the upgrade.'));
+    $session->pageTextContains(t('The no_source_module plugin must define the source_module property.'));
+
+    // Uninstall the module causing the missing module error messages.
+    $this->container->get('module_installer')
+      ->uninstall(['migration_provider_test'], TRUE);
+
+    // Restart the upgrade process and test there is no source_module error.
+    $this->drupalGet('/upgrade');
+    $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $new_site_version.");
+    $this->drupalPostForm(NULL, [], t('Continue'));
+    $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
+    $session->fieldExists('mysql[host]');
+    $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
+
+    // Ensure there are no errors about missing modules from the test module.
+    $session->pageTextNotContains(t('Source module not found for migration_provider_no_annotation.'));
+    $session->pageTextNotContains(t('Source module not found for migration_provider_test.'));
+    // Ensure there are no errors about any other missing migration providers.
+    $session->pageTextNotContains(t('module not found'));
+  }
+
+  /**
+   * Data provider for testSourceProvider.
+   */
+  public function providerSourceProvider() {
+    return [
+      [
+        'path_to_database' => '/tests/fixtures/drupal6.php',
+      ],
+      [
+        'path_to_database' => '/tests/fixtures/drupal7.php',
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getSourceBasePath() {
+    return '';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getAvailablePaths() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntityCounts() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntityCountsIncremental() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getMissingPaths() {
+    return [];
+  }
+
+}
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
index 48732afba980a2af56e4604ec7a0baab875f99d4..32db014c1a47f6216412f1a262d915dfe120f5b2 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
@@ -30,7 +30,6 @@ class Upgrade6Test extends MigrateUpgradeExecuteTestBase {
     'book',
     'forum',
     'statistics',
-    'migration_provider_test',
   ];
 
   /**
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
index 9625cb3a4131ccd4fbf30bf960dde89494176814..eb6295c5f7390c2bdb4783f936fa2f014aa4000c 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
@@ -32,7 +32,6 @@ class Upgrade7Test extends MigrateUpgradeExecuteTestBase {
     'forum',
     'rdf',
     'statistics',
-    'migration_provider_test',
   ];
 
   /**