diff -u b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php
--- b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php
@@ -103,8 +103,8 @@
     // Create content.
     $this->createContent();
 
-    // Audit the IDs of all migrations. There should be no conflicts since no
-    // content has been created.
+    // Audit the IDs of all migrations. There should be conflicts since content
+    // has been created.
     $conflicts = $this->container->get('migrate.id_auditor')->auditIds($migrations);
     ksort($conflicts);
 
@@ -116,7 +116,9 @@
       'd6_file',
       'd6_menu_links',
       'd6_node',
+      'd6_node_revision',
       'd6_taxonomy_term',
+      'd6_term_node_revision',
       'd6_user',
     ];
 
diff -u b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php
--- b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php
@@ -103,8 +103,8 @@
     // Create content.
     $this->createContent();
 
-    // Audit the IDs of all migrations. There should be no conflicts since no
-    // content has been created.
+    // Audit the IDs of all migrations. There should be conflicts since content
+    // has been created.
     $conflicts = $this->container->get('migrate.id_auditor')->auditIds($migrations);
     ksort($conflicts);
 
@@ -117,6 +117,7 @@
       'd7_file_private',
       'd7_menu_links',
       'd7_node',
+      'd7_node_revision',
       'd7_taxonomy_term',
       'd7_user',
     ];
diff -u b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
--- b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
@@ -147,8 +147,10 @@
 
     $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
     $this->assertResponse(200);
-    $this->assertText('Are you sure?');
+    $this->assertSession()->pageTextContains('Entities may be overwritten');
+    $this->drupalPostForm(NULL, [], t('I acknowledge I may lose data, continue anyway.'));
     // Ensure we get errors about missing modules.
+    $this->assertSession()->pageTextContains('Upgrade analysis report?');
     $this->assertSession()->pageTextContains(t('Source module not found for migration_provider_no_annotation.'));
     $this->assertSession()->pageTextContains(t('Source module not found for migration_provider_test.'));
     $this->assertSession()->pageTextContains(t('Destination module not found for migration_provider_test'));
@@ -166,11 +168,10 @@
 
     $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
     $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('Are you sure?');
-    $this->assertSession()->pageTextContains('Entities may be overwritten?');
+    $this->assertSession()->pageTextContains('Entities may be overwritten');
     $this->drupalPostForm(NULL, [], t('I acknowledge I may lose data, continue anyway.'));
     // Ensure there are no errors about the missing modules from the test module.
-    $this->assertText('Are you sure?');
+    $this->assertSession()->pageTextContains('Upgrade analysis report?');
     $this->assertSession()->pageTextNotContains(t('Source module not found for migration_provider_no_annotation.'));
     $this->assertSession()->pageTextNotContains(t('Source module not found for migration_provider_test.'));
     $this->assertSession()->pageTextNotContains(t('Destination module not found for migration_provider_test'));