diff --git a/core/modules/language/src/Tests/AdminPathEntityConverterLanguageTest.php b/core/modules/language/src/Tests/AdminPathEntityConverterLanguageTest.php
index 3d5caa6..1e74dbc 100644
--- a/core/modules/language/src/Tests/AdminPathEntityConverterLanguageTest.php
+++ b/core/modules/language/src/Tests/AdminPathEntityConverterLanguageTest.php
@@ -17,7 +17,7 @@
  */
 class AdminPathEntityConverterLanguageTest extends WebTestBase {
 
-  public static $modules = array('language_test');
+  public static $modules = array('language', 'language_test');
 
   protected function setUp() {
     parent::setUp();
diff --git a/core/modules/language/tests/language_test/language_test.routing.yml b/core/modules/language/tests/language_test/language_test.routing.yml
index ad83d85..4f9a78c 100644
--- a/core/modules/language/tests/language_test/language_test.routing.yml
+++ b/core/modules/language/tests/language_test/language_test.routing.yml
@@ -15,19 +15,19 @@ language_test.subrequest:
 language_test.entity_using_original_language:
   path: '/admin/language_test/entity_using_original_language/{configurable_language}'
   defaults:
-    _content: '\Drupal\language_test\Controller\LanguageTestController::testEntity'
+    _controller: '\Drupal\language_test\Controller\LanguageTestController::testEntity'
   requirements:
     _access: 'TRUE'
 
 language_test.entity_using_current_language:
   path: '/admin/language_test/entity_using_current_language/{configurable_language}'
   defaults:
-    _content: '\Drupal\language_test\Controller\LanguageTestController::testEntity'
+    _controller: '\Drupal\language_test\Controller\LanguageTestController::testEntity'
   requirements:
     _access: 'TRUE'
   options:
     parameters:
-      config_test:
-        type: entity:config_test
+      configurable_language:
+        type: entity:configurable_language
         # Force load in current interface language.
         use_current_language: 'TRUE'
diff --git a/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php b/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php
index ea24b4f..c783d3a 100644
--- a/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php
+++ b/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php
@@ -64,8 +64,8 @@ public static function create(ContainerInterface $container) {
    * @return string
    *   Testing feedback based on (translated) entity title.
    */
-  public function testEntity(ConfigurableLanguageInterface $language) {
-    return $this->t('Loaded %label.', array('%label' => $language->label()));
+  public function testEntity(ConfigurableLanguageInterface $configurable_language) {
+    return array('#markup' => $this->t('Loaded %label.', array('%label' => $configurable_language->label())));
   }
 
   /**