diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php
index a2782aec6d..5b04c66e9a 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\migrate_drupal_ui\Functional\d7;
+namespace Drupal\Tests\migrate_drupal_ui\Functional\d6;
 
 use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeExecuteTestBase;
 
@@ -29,10 +29,8 @@ class IdConflictTest extends MigrateUpgradeExecuteTestBase {
     'book',
     'forum',
     'statistics',
-    'migration_provider_test',
     // Required for translation migrations.
     'migrate_drupal_multilingual',
-    'node_migrate_master',
   ];
 
   /**
@@ -119,40 +117,7 @@ public function testMigrateUpgradeExecute() {
     }
     $edits = $this->translatePostValues($edit);
 
-    // Ensure submitting the form with invalid database credentials gives us a
-    // nice warning.
-    $this->drupalPostForm(NULL, [$driver . '[database]' => 'wrong'] + $edits, t('Review upgrade'));
-    $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');
-    $this->drupalPostForm(NULL, [], t('Continue'));
-    if ($version == 6) {
-      $paths['d6_source_base_path'] = DRUPAL_ROOT . '/wrong-path';
-    }
-    else {
-      $paths['source_base_path'] = 'https://example.com/wrong-path';
-      $paths['source_private_file_path'] = DRUPAL_ROOT . '/wrong-path';
-    }
-    $this->drupalPostForm(NULL, $paths + $edits, t('Review upgrade'));
-    if ($version == 6) {
-      $session->responseContains('Failed to read from Files directory.');
-    }
-    else {
-      $session->responseContains('Failed to read from Public files directory.');
-      $session->responseContains('Failed to read from Private files directory.');
-    }
-
-    // Restart the upgrade process.
+    // Start the upgrade process.
     $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 8.');
 
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php
index 215b6198bb..c0ce31dcea 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\migrate_drupal_ui\Functional\d6;
+namespace Drupal\Tests\migrate_drupal_ui\Functional\d7;
 
 use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeExecuteTestBase;
 
@@ -29,10 +29,8 @@ class IdConflictTest extends MigrateUpgradeExecuteTestBase {
     'forum',
     'rdf',
     'statistics',
-    'migration_provider_test',
     // Required for translation migrations.
     'migrate_drupal_multilingual',
-    'node_migrate_master',
   ];
 
   /**
@@ -119,40 +117,7 @@ public function testMigrateUpgradeExecute() {
     }
     $edits = $this->translatePostValues($edit);
 
-    // Ensure submitting the form with invalid database credentials gives us a
-    // nice warning.
-    $this->drupalPostForm(NULL, [$driver . '[database]' => 'wrong'] + $edits, t('Review upgrade'));
-    $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');
-    $this->drupalPostForm(NULL, [], t('Continue'));
-    if ($version == 6) {
-      $paths['d6_source_base_path'] = DRUPAL_ROOT . '/wrong-path';
-    }
-    else {
-      $paths['source_base_path'] = 'https://example.com/wrong-path';
-      $paths['source_private_file_path'] = DRUPAL_ROOT . '/wrong-path';
-    }
-    $this->drupalPostForm(NULL, $paths + $edits, t('Review upgrade'));
-    if ($version == 6) {
-      $session->responseContains('Failed to read from Files directory.');
-    }
-    else {
-      $session->responseContains('Failed to read from Public files directory.');
-      $session->responseContains('Failed to read from Private files directory.');
-    }
-
-    // Restart the upgrade process.
+    // Start the upgrade process.
     $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 8.');