diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index cd4634fa32..4688ece2c6 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -69,13 +69,6 @@ class MigrateUpgradeForm extends ConfirmFormBase {
   protected $moduleHandler;
 
   /**
-   * The auditor service.
-   *
-   * @var \Drupal\migrate\Audit\AuditorInterface
-   */
-  protected $auditor;
-
-  /**
    * Constructs the MigrateUpgradeForm.
    *
    * @param \Drupal\Core\State\StateInterface $state
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
index 5b39305458..21816ba53a 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
@@ -6,12 +6,14 @@
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate_drupal\MigrationConfigurationTrait;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\migrate_drupal\Kernel\CreateContentTrait;
 
 /**
  * Provides a base class for testing migration upgrades in the UI.
  */
 abstract class MigrateUpgradeTestBase extends BrowserTestBase {
   use MigrationConfigurationTrait;
+  use CreateContentTrait;
 
   /**
    * Use the Standard profile to test help implementations of many core modules.
@@ -54,6 +56,9 @@ protected function setUp() {
 
     // Log in as user 1. Migrations in the UI can only be performed as user 1.
     $this->drupalLogin($this->rootUser);
+
+    // Create content.
+    $this->createContent();
   }
 
   /**
@@ -154,6 +159,18 @@ public function testMigrateUpgrade() {
 
     $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
     $this->assertSession()->pageTextContains('Content may be overwritten');
+    $this->assertSession()->pageTextContains('The conflicting content are of the following types:');
+    $this->assertSession()->pageTextContains('aggregator feed entities');
+    $this->assertSession()->pageTextContains('aggregator feed item entities');
+    $this->assertSession()->pageTextContains('custom block entities');
+    $this->assertSession()->pageTextContains('custom menu link entities');
+    $this->assertSession()->pageTextContains('file entities');
+    $this->assertSession()->pageTextContains('taxonomy term entities');
+    $this->assertSession()->pageTextContains('user entities');
+    $this->assertSession()->pageTextContains('comments');
+    $this->assertSession()->pageTextContains('content item revisions');
+    $this->assertSession()->pageTextContains('content items');
+    $this->assertSession()->pageTextContains('The translated content are of the following types:');
     $this->drupalPostForm(NULL, [], t('I acknowledge I may lose data, continue anyway.'));
     $this->assertResponse(200);
     $this->assertText('Upgrade analysis report');
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..432b7036d7 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
@@ -35,7 +35,7 @@ protected function getSourceBasePath() {
   protected function getEntityCounts() {
     return [
       'aggregator_item' => 1,
-      'aggregator_feed' => 1,
+      'aggregator_feed' => 2,
       'block' => 35,
       'block_content' => 2,
       'block_content_type' => 1,
@@ -48,7 +48,7 @@ protected function getEntityCounts() {
       'editor' => 2,
       'field_config' => 84,
       'field_storage_config' => 58,
-      'file' => 7,
+      'file' => 8,
       'filter_format' => 7,
       'image_style' => 5,
       'language_content_settings' => 2,
@@ -68,7 +68,7 @@ protected function getEntityCounts() {
       'tour' => 4,
       'user' => 7,
       'user_role' => 6,
-      'menu_link_content' => 4,
+      'menu_link_content' => 5,
       'view' => 16,
       'date_format' => 11,
       'entity_form_display' => 29,
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..608967c754 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
@@ -39,7 +39,7 @@ protected function getSourceBasePath() {
    */
   protected function getEntityCounts() {
     return [
-      'aggregator_item' => 10,
+      'aggregator_item' => 11,
       'aggregator_feed' => 1,
       'block' => 25,
       'block_content' => 1,
@@ -72,7 +72,7 @@ protected function getEntityCounts() {
       'tour' => 4,
       'user' => 4,
       'user_role' => 3,
-      'menu_link_content' => 7,
+      'menu_link_content' => 8,
       'view' => 16,
       'date_format' => 11,
       'entity_form_display' => 17,