diff --git a/core/modules/block/src/Tests/BlockLanguageTest.php b/core/modules/block/src/Tests/BlockLanguageTest.php
index fd851e8..6951929 100644
--- a/core/modules/block/src/Tests/BlockLanguageTest.php
+++ b/core/modules/block/src/Tests/BlockLanguageTest.php
@@ -117,8 +117,8 @@ public function testMultipleLanguageTypes() {
     // Customize content language settings from their defaults.
     $edit = array(
       'language_content[configurable]' => TRUE,
-      'language_content[enabled][language-url]' => FALSE,
-      'language_content[enabled][language-session]' => TRUE,
+      'language_interface[enabled][language-url]' => FALSE,
+      'language_interface[enabled][language-session]' => TRUE,
     );
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
@@ -139,16 +139,16 @@ public function testMultipleLanguageTypes() {
     $this->drupalPostForm('admin/structure/block/add/system_powered_by_block' . '/' . $default_theme, $edit, t('Save block'));
 
     // Interface negotiation depends on path prefix.
-    $this->drupalGet('en');
+    $this->drupalGet('node', array('query' => array('language' => 'en')));
     $this->assertNoText('Powered by Drupal', 'The body of the block does not appear on the page.');
-    $this->drupalGet('fr');
+    $this->drupalGet('node', array('query' => array('language' => 'fr')));
     $this->assertText('Powered by Drupal', 'The body of the block appears on the page.');
 
     // Interface negotiation does not depend on session/request arguments.
     // It will fall back on English (site default) and not display the block.
-    $this->drupalGet('user', array('query' => array('language' => 'en')));
+    $this->drupalGet('en');
     $this->assertNoText('Powered by Drupal', 'The body of the block does not appear on the page.');
-    $this->drupalGet('user', array('query' => array('language' => 'fr')));
+    $this->drupalGet('fr');
     $this->assertNoText('Powered by Drupal', 'The body of the block does not appear on the page.');
 
     // Change visibility to now depend on content language for this block.
@@ -159,15 +159,15 @@ public function testMultipleLanguageTypes() {
 
     // Content language negotiation does not depend on path prefix.
     // It will fall back on English (site default) and not display the block.
-    $this->drupalGet('en');
+    $this->drupalGet('node', array('query' => array('language' => 'en')));
     $this->assertNoText('Powered by Drupal', 'The body of the block does not appear on the page.');
-    $this->drupalGet('fr');
+    $this->drupalGet('node', array('query' => array('language' => 'fr')));
     $this->assertNoText('Powered by Drupal', 'The body of the block does not appear on the page.');
 
     // Content language negotiation depends on request arguments.
-    $this->drupalGet('user', array('query' => array('language' => 'en')));
+    $this->drupalGet('en');
     $this->assertNoText('Powered by Drupal', 'The body of the block does not appear on the page.');
-    $this->drupalGet('user', array('query' => array('language' => 'fr')));
+    $this->drupalGet('fr');
     $this->assertText('Powered by Drupal', 'The body of the block appears on the page.');
   }