diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index f238504495..9f8232b152 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -67,6 +67,36 @@ class MigrateUpgradeForm extends ConfirmFormBase {
   protected $moduleHandler;
 
   /**
+   * Drupal 6 modules that do no need an upgrade path.
+   */
+  public static $d6_no_upgrade_path = [
+    'date_api',
+    'help',
+    'imageapi',
+    'nodereference',
+    'php',
+    'userreference',
+    'variable_admin',
+    'views',
+  ];
+
+  /**
+   * Drupal 7 modules that do no need an upgrade path.
+   */
+  public static $d7_no_upgrade_path = [
+    'blog',
+    'contextual',
+    'date_api',
+    'entity',
+    'field_ui',
+    'help',
+    'overlay',
+    'php',
+    'toolbar',
+    'trigger',
+  ];
+
+  /**
    * Constructs the MigrateUpgradeForm.
    *
    * @param \Drupal\Core\State\StateInterface $state
@@ -513,6 +543,13 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) {
       $table_data[$source_module][$destination_module][$definition['id']] = $definition['id'];
     }
 
+    // Add source_module and destination_module for modules that do not need an
+    // upgrade path.
+    $no_upgrade_path = ($version == '6') ? static::$d6_no_upgrade_path : static::$d7_no_upgrade_path;
+    foreach ($no_upgrade_path as $module) {
+      $table_data[$module]['core'][$module] = $module;
+    }
+
     // Sort the table by source module names and within that destination
     // module names.
     ksort($table_data);
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php
index 3717606cd8..cbb9198dac 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php
@@ -121,6 +121,15 @@ protected function getAvailablePaths() {
       'upload',
       'user',
       'user_reference',
+      // Modules that have no upgrade path.
+      'date_api',
+      'help',
+      'imageapi',
+      'nodereference',
+      'php',
+      'userreference',
+      'variable_admin',
+      'views',
     ];
   }
 
@@ -129,7 +138,6 @@ protected function getAvailablePaths() {
    */
   protected function getMissingPaths() {
     return [
-      'date_api',
       'date_timezone',
       'event',
       'i18n',
@@ -139,9 +147,6 @@ protected function getMissingPaths() {
       'i18nmenu',
       'i18nprofile',
       'i18nstrings',
-      'imageapi',
-      'php',
-      'variable_admin',
     ];
   }
 
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php
index 3cfe4bc6d7..5d6e9facc9 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php
@@ -124,6 +124,17 @@ protected function getAvailablePaths() {
       'translation',
       'user',
       'user_reference',
+      // Modules that have no upgrade path.
+      'blog',
+      'contextual',
+      'date_api',
+      'entity',
+      'field_ui',
+      'help',
+      'overlay',
+      'php',
+      'toolbar',
+      'trigger',
     ];
   }
 
@@ -132,21 +143,12 @@ protected function getAvailablePaths() {
    */
   protected function getMissingPaths() {
     return [
-      'blog',
       'book',
       'color',
-      'contextual',
-      'date_api',
-      'entity',
-      'field_ui',
-      'help',
-      'php',
       'rdf',
       'simpletest',
       'syslog',
-      'toolbar',
       'tracker',
-      'trigger',
       'update',
     ];
   }