diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php
index f264f56689..a3c1e6a853 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
-use Drupal\Core\StringTranslation\TranslatableMarkup;;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index 4688ece2c6..1e38cc14ee 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -565,7 +565,7 @@ protected function formatConflicts(array $conflicts) {
       $id = $definition['id'];
       $items[$id] = $definition['label'];
     }
-    sort($items);
+    sort($items, SORT_STRING);
 
     return $items;
   }
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 455b28f9ab..0d3c10bc9c 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
@@ -122,7 +122,8 @@ protected function tearDown() {
   public function testMigrateUpgrade() {
     $connection_options = $this->sourceDatabase->getConnectionOptions();
     $this->drupalGet('/upgrade');
-    $this->assertSession()->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.');
+    $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'));
     $this->assertText('Provide credentials for the database of the Drupal site you want to upgrade.');
@@ -159,53 +160,52 @@ public function testMigrateUpgrade() {
     $this->assertText('Resolve the issue below to continue the upgrade.');
 
     $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:');
+    $session->pageTextContains('Content may be overwritten');
+    $session->pageTextContains('The conflicting content are of the following types:');
+    $session->pageTextContains('aggregator feed entities');
+    $session->pageTextContains('aggregator feed item entities');
+    $session->pageTextContains('custom block entities');
+    $session->pageTextContains('custom menu link entities');
+    $session->pageTextContains('file entities');
+    $session->pageTextContains('taxonomy term entities');
+    $session->pageTextContains('user entities');
+    $session->pageTextContains('comments');
+    $session->pageTextContains('content item revisions');
+    $session->pageTextContains('content items');
+    $session->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');
     // Ensure we get errors about missing modules.
-    $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'));
+    $session->pageTextContains(t('Source module not found for migration_provider_no_annotation.'));
+    $session->pageTextContains(t('Source module not found for migration_provider_test.'));
+    $session->pageTextContains(t('Destination module not found for migration_provider_test'));
 
     // Uninstall the module causing the missing module error messages.
     $this->container->get('module_installer')->uninstall(['migration_provider_test'], TRUE);
 
     // Restart the upgrade process.
     $this->drupalGet('/upgrade');
-    $this->assertSession()->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.');
+    $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'));
-    $this->assertSession()->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
-    $this->assertSession()->fieldExists('mysql[host]');
+    $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->assertSession()->pageTextContains('Content may be overwritten');
+    $session->pageTextContains('Content may be overwritten');
     $this->drupalPostForm(NULL, [], t('I acknowledge I may lose data, continue anyway.'));
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('Upgrade analysis report');
+    $session->statusCodeEquals(200);
+    $session->pageTextContains('Upgrade analysis report');
     // Ensure there are no errors about the missing modules from the test module.
-    $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'));
+    $session->pageTextNotContains(t('Source module not found for migration_provider_no_annotation.'));
+    $session->pageTextNotContains(t('Source module not found for migration_provider_test.'));
+    $session->pageTextNotContains(t('Destination module not found for migration_provider_test'));
     // Ensure there are no errors about any other missing migration providers.
-    $this->assertSession()->pageTextNotContains(t('module not found'));
+    $session->pageTextNotContains(t('module not found'));
 
     // Test the available migration paths.
     $all_available = $this->getAvailablePaths();
-    $session = $this->assertSession();
     foreach ($all_available as $available) {
       $session->elementExists('xpath', "//span[contains(@class, 'checked') and text() = '$available']");
       $session->elementNotExists('xpath', "//span[contains(@class, 'warning') and text() = '$available']");