diff --git a/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php b/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php
index 7bc65ce..a7f42fe 100644
--- a/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php
+++ b/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php
@@ -26,11 +26,13 @@ protected function setDatabaseDumpFiles() {
   }
 
   /**
-   * Tests that the nodes were properly updated.
+   * Tests that the content and configuration were properly updated.
    */
-  public function testUpdatedContent() {
+  public function testUpdatedSite() {
     $this->runUpdates();
 
+    $spanish = \Drupal::languageManager()->getLanguage('es');
+
     $expected_node_data = array(
       [1, 'article', 'en', 'Test Article - New title'],
       [2, 'book', 'en', 'Book page'],
@@ -66,7 +68,7 @@ public function testUpdatedContent() {
     $this->assertText('Tags');
 
     // Make sure a translated page exists.
-    $this->drupalGet('es/node/8');
+    $this->drupalGet('node/8', ['language' => $spanish]);
     $this->assertText('Hola');
     $this->assertText('Hello');
     // The user entity reference field is access restricted.
@@ -77,6 +79,7 @@ public function testUpdatedContent() {
         $this->assertText('Test ' . $i);
       }
     }
+
     // Make sure the translated slogan appears.
     $this->assertText('drupal Spanish');
 
@@ -94,7 +97,7 @@ public function testUpdatedContent() {
 
     // Make sure we can see the access-restricted entity reference field
     // now that we're logged in.
-    $this->drupalGet('es/node/8');
+    $this->drupalGet('node/8', ['language' => $spanish]);
     $this->assertText('Test 12');
     $this->assertLink('drupal');
 
@@ -119,7 +122,7 @@ public function testUpdatedContent() {
     $this->assertRaw('0.01');
     $this->drupalPostForm('node/8/edit', [], 'Save and keep published (this translation)');
     $this->assertResponse(200);
-    $this->drupalGet('es/node/8/edit');
+    $this->drupalGet('node/8/edit', ['language' => $spanish]);
     $this->assertText('Test title Spanish');
     $this->assertText('Test body Spanish');
 
@@ -254,9 +257,9 @@ public function testUpdatedContent() {
     $this->drupalGet('admin/config/media/responsive-image-style/test');
     $this->assertResponse(200);
     $this->assertText('Test');
-    $this->drupalGet('admin/config/user-interface/shortcut');
 
     // Make sure our custom shortcut exists.
+    $this->drupalGet('admin/config/user-interface/shortcut');
     $this->assertText('Test shortcut');
     $this->drupalGet('admin/config/user-interface/shortcut/manage/test/customize');
     $this->assertText('All content');