diff --git a/core/modules/taxonomy/migrations/d6_taxonomy_vocabulary_translation.yml b/core/modules/config_translation/migrations/d6_taxonomy_vocabulary_translation.yml
similarity index 100%
rename from core/modules/taxonomy/migrations/d6_taxonomy_vocabulary_translation.yml
rename to core/modules/config_translation/migrations/d6_taxonomy_vocabulary_translation.yml
diff --git a/core/modules/migrate_drupal/migrations/d6_entity_reference_translation.yml b/core/modules/content_translation/migrations/d6_entity_reference_translation.yml
similarity index 100%
rename from core/modules/migrate_drupal/migrations/d6_entity_reference_translation.yml
rename to core/modules/content_translation/migrations/d6_entity_reference_translation.yml
diff --git a/core/modules/node/migrations/d6_node_translation.yml b/core/modules/content_translation/migrations/d6_node_translation.yml
similarity index 100%
rename from core/modules/node/migrations/d6_node_translation.yml
rename to core/modules/content_translation/migrations/d6_node_translation.yml
diff --git a/core/modules/migrate_drupal/migrations/d7_entity_reference_translation.yml b/core/modules/content_translation/migrations/d7_entity_reference_translation.yml
similarity index 100%
rename from core/modules/migrate_drupal/migrations/d7_entity_reference_translation.yml
rename to core/modules/content_translation/migrations/d7_entity_reference_translation.yml
diff --git a/core/modules/node/migrations/d7_node_translation.yml b/core/modules/content_translation/migrations/d7_node_translation.yml
similarity index 100%
rename from core/modules/node/migrations/d7_node_translation.yml
rename to core/modules/content_translation/migrations/d7_node_translation.yml
diff --git a/core/modules/menu_link_content/migrations/node_translation_menu_links.yml b/core/modules/content_translation/migrations/node_translation_menu_links.yml
similarity index 100%
rename from core/modules/menu_link_content/migrations/node_translation_menu_links.yml
rename to core/modules/content_translation/migrations/node_translation_menu_links.yml
diff --git a/core/modules/statistics/migrations/statistics_node_translation_counter.yml b/core/modules/content_translation/migrations/statistics_node_translation_counter.yml
similarity index 100%
rename from core/modules/statistics/migrations/statistics_node_translation_counter.yml
rename to core/modules/content_translation/migrations/statistics_node_translation_counter.yml
diff --git a/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php
index 10c113aeb8..7f898cd80d 100644
--- a/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php
+++ b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php
@@ -113,7 +113,7 @@ protected function getMigrations($database_state_key, $drupal_version) {
       // Multilingual migrations require migrate_drupal_multilingual.
       $tags = $migration->getMigrationTags() ?: [];
       if (in_array('Multilingual', $tags, TRUE) && (!\Drupal::service('module_handler')->moduleExists('migrate_drupal_multilingual'))) {
-        throw new RequirementsException("The module migrate_drupal_multilingual is not enabled on the new site.");
+        throw new RequirementsException( sprintf("Install migrate_drupal_multilingual to run migration '%s'.", $migration->getPluginId()));
       }
 
       try {
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nTest.php
index dbea5df07f..c77a2cbe08 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nTest.php
@@ -185,7 +185,8 @@ public function testMigrateUpgradeExecute() {
     $session = $this->assertSession();
     $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.');
 
-    $this->drupalPostForm(NULL, [], t('Continue'));
+    $button = $session->buttonExists('Continue');
+    $button->click();
     $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
     $session->fieldExists('mysql[host]');
 
@@ -230,7 +231,8 @@ public function testMigrateUpgradeExecute() {
 
     // Test the file sources.
     $this->drupalGet('/upgrade');
-    $this->drupalPostForm(NULL, [], t('Continue'));
+    $button = $session->buttonExists('Continue');
+    $button->click();
     if ($version == 6) {
       $paths['d6_source_base_path'] = DRUPAL_ROOT . '/wrong-path';
     }
@@ -251,14 +253,16 @@ public function testMigrateUpgradeExecute() {
     $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.');
 
-    $this->drupalPostForm(NULL, [], t('Continue'));
+    $button = $session->buttonExists('Continue');
+    $button->click();
     $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
     $session->fieldExists('mysql[host]');
 
     $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
     $this->assertIdConflict($session);
 
-    $this->drupalPostForm(NULL, [], t('I acknowledge I may lose data. Continue anyway.'));
+    $button = $session->buttonExists('I acknowledge I may lose data. Continue anyway.');
+    $button->click();
     $session->statusCodeEquals(200);
 
     // Ensure there are no errors about missing modules from the test module.
@@ -272,7 +276,8 @@ public function testMigrateUpgradeExecute() {
     $missing_paths = $this->getMissingPaths();
     $this->assertReviewPage($session, $available_paths, $missing_paths);
 
-    $this->drupalPostForm(NULL, [], t('Perform upgrade'));
+    $button = $session->buttonExists('Perform upgrade');
+    $button->click();
     $session->pageTextContains(t('Congratulations, you upgraded Drupal!'));
     $this->assertMigrationResults($this->getEntityCounts(), $version);
 
@@ -284,7 +289,8 @@ public function testMigrateUpgradeExecute() {
 
     $this->drupalGet('/upgrade');
     $session->pageTextContains('An upgrade has already been performed on this site. To perform a new migration, create a clean and empty new install of Drupal 8. Rollbacks are not yet supported through the user interface.');
-    $this->drupalPostForm(NULL, [], t('Import new configuration and content from old site'));
+    $button = $session->buttonExists('Import new configuration and content from old site');
+    $button->click();
     $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
     $session->pageTextContains('WARNING: Content may be overwritten on your new site.');
     $session->pageTextContains('There is conflicting content of these types:');
@@ -297,7 +303,8 @@ public function testMigrateUpgradeExecute() {
     $session->pageTextContains('taxonomy terms');
     $session->pageTextContains('users');
 
-    $this->drupalPostForm(NULL, [], t('I acknowledge I may lose data. Continue anyway.'));
+    $button = $session->buttonExists('I acknowledge I may lose data. Continue anyway.');
+    $button->click();
     $session->statusCodeEquals(200);
 
     // Need to update available and missing path lists.
@@ -306,7 +313,8 @@ public function testMigrateUpgradeExecute() {
     $all_missing = $this->getMissingPaths();
     $all_missing = array_diff($all_missing, ['aggregator']);
     $this->assertReviewPage($session, $all_available, $all_missing);
-    $this->drupalPostForm(NULL, [], t('Perform upgrade'));
+    $button = $session->buttonExists('Perform upgrade');
+    $button->click();
     $session->pageTextContains(t('Congratulations, you upgraded Drupal!'));
     $this->assertMigrationResults($this->getEntityCountsIncremental(), $version);
 
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7I18nTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7I18nTest.php
index b5e16dddd3..c46bf5ea6e 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7I18nTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7I18nTest.php
@@ -189,7 +189,8 @@ public function testMigrateUpgradeExecute() {
     $session = $this->assertSession();
     $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.');
 
-    $this->drupalPostForm(NULL, [], t('Continue'));
+    $button = $session->buttonExists('Continue');
+    $button->click();
     $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
     $session->fieldExists('mysql[host]');
 
@@ -234,7 +235,8 @@ public function testMigrateUpgradeExecute() {
 
     // Test the file sources.
     $this->drupalGet('/upgrade');
-    $this->drupalPostForm(NULL, [], t('Continue'));
+    $button = $session->buttonExists('Continue');
+    $button->click();
     if ($version == 6) {
       $paths['d6_source_base_path'] = DRUPAL_ROOT . '/wrong-path';
     }
@@ -255,14 +257,16 @@ public function testMigrateUpgradeExecute() {
     $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.');
 
-    $this->drupalPostForm(NULL, [], t('Continue'));
+    $button = $session->buttonExists('Continue');
+    $button->click();
     $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
     $session->fieldExists('mysql[host]');
 
     $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
     $this->assertIdConflict($session);
 
-    $this->drupalPostForm(NULL, [], t('I acknowledge I may lose data. Continue anyway.'));
+    $button = $session->buttonExists('I acknowledge I may lose data. Continue anyway.');
+    $button->click();
     $session->statusCodeEquals(200);
 
     // Ensure there are no errors about missing modules from the test module.
@@ -276,7 +280,8 @@ public function testMigrateUpgradeExecute() {
     $missing_paths = $this->getMissingPaths();
     $this->assertReviewPage($session, $available_paths, $missing_paths);
 
-    $this->drupalPostForm(NULL, [], t('Perform upgrade'));
+    $button = $session->buttonExists('Perform upgrade');
+    $button->click();
     $session->pageTextContains(t('Congratulations, you upgraded Drupal!'));
     $this->assertMigrationResults($this->getEntityCounts(), $version);
 
@@ -288,7 +293,8 @@ public function testMigrateUpgradeExecute() {
 
     $this->drupalGet('/upgrade');
     $session->pageTextContains('An upgrade has already been performed on this site. To perform a new migration, create a clean and empty new install of Drupal 8. Rollbacks are not yet supported through the user interface.');
-    $this->drupalPostForm(NULL, [], t('Import new configuration and content from old site'));
+    $button = $session->buttonExists('Import new configuration and content from old site');
+    $button->click();
     $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
     $session->pageTextContains('WARNING: Content may be overwritten on your new site.');
     $session->pageTextContains('There is conflicting content of these types:');
@@ -301,7 +307,8 @@ public function testMigrateUpgradeExecute() {
     $session->pageTextContains('taxonomy terms');
     $session->pageTextContains('users');
 
-    $this->drupalPostForm(NULL, [], t('I acknowledge I may lose data. Continue anyway.'));
+    $button = $session->buttonExists('I acknowledge I may lose data. Continue anyway.');
+    $button->click();
     $session->statusCodeEquals(200);
 
     // Need to update available and missing path lists.
@@ -310,7 +317,8 @@ public function testMigrateUpgradeExecute() {
     $all_missing = $this->getMissingPaths();
     $all_missing = array_diff($all_missing, ['aggregator']);
     $this->assertReviewPage($session, $all_available, $all_missing);
-    $this->drupalPostForm(NULL, [], t('Perform upgrade'));
+    $button = $session->buttonExists('Perform upgrade');
+    $button->click();
     $session->pageTextContains(t('Congratulations, you upgraded Drupal!'));
     $this->assertMigrationResults($this->getEntityCountsIncremental(), $version);