diff --git a/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
index 30a4693..226bb9e 100644
--- a/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
@@ -66,9 +66,9 @@ protected function getEntityCounts() {
       'menu_link_content' => 9,
       'view' => 12,
       'date_format' => 11,
-      'entity_form_display' => 15,
+      'entity_form_display' => 16,
       'entity_form_mode' => 1,
-      'entity_view_display' => 22,
+      'entity_view_display' => 24,
       'entity_view_mode' => 11,
       'base_field_override' => 7,
     ];
diff --git a/core/modules/taxonomy/tests/src/Unit/Migrate/TermTestBase.php b/core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermTestBase.php
similarity index 100%
rename from core/modules/taxonomy/tests/src/Unit/Migrate/TermTestBase.php
rename to core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermTestBase.php
diff --git a/core/modules/taxonomy/tests/src/Unit/Migrate/TermSourceWithVocabularyFilterTest.php b/core/modules/taxonomy/tests/src/Unit/Migrate/d7/TermSourceWithVocabularyFilterTest.php
similarity index 100%
rename from core/modules/taxonomy/tests/src/Unit/Migrate/TermSourceWithVocabularyFilterTest.php
rename to core/modules/taxonomy/tests/src/Unit/Migrate/d7/TermSourceWithVocabularyFilterTest.php