diff --git a/core/modules/system/src/Tests/Theme/ThemeSuggestionsAlterTest.php b/core/modules/system/src/Tests/Theme/ThemeSuggestionsAlterTest.php
index d27f763..d13e3a8 100644
--- a/core/modules/system/src/Tests/Theme/ThemeSuggestionsAlterTest.php
+++ b/core/modules/system/src/Tests/Theme/ThemeSuggestionsAlterTest.php
@@ -77,7 +77,7 @@ public function testArraySuggestionsAlter() {
 
     // Enable test_theme, it contains a hook_theme_suggestions_HOOK_alter()
     // implementation and template that we can test.
-    \Drupal::config('system.theme')
+    $this->config('system.theme')
       ->set('default', 'test_theme')
       ->save();
 
@@ -97,7 +97,7 @@ public function testArraySuggestionsWithoutBaseAlter() {
 
     // Enable test_theme, it contains a hook_theme_suggestions_HOOK_alter()
     // implementation and template that we can test.
-    \Drupal::config('system.theme')
+    $this->config('system.theme')
       ->set('default', 'test_theme')
       ->save();
 
diff --git a/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php b/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php
index 7fdda68..4bdaeaf 100644
--- a/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php
+++ b/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php
@@ -124,6 +124,7 @@ function functionSuggestionAlter() {
     return array('#theme' => 'theme_test_function_suggestions');
   }
 
+
   /**
    * Menu callback for testing includes with suggestion alter hooks.
    */
diff --git a/core/modules/system/tests/modules/theme_test/theme_test.module b/core/modules/system/tests/modules/theme_test/theme_test.module
index c903bb1..f43ad42 100644
--- a/core/modules/system/tests/modules/theme_test/theme_test.module
+++ b/core/modules/system/tests/modules/theme_test/theme_test.module
@@ -30,11 +30,9 @@ function theme_test_theme($existing, $type, $theme, $path) {
     'variables' => array(),
   );
   $items['theme_test_array_suggestions'] = array(
-    'template' => 'theme-test-array-suggestions',
     'variables' => array(),
   );
   $items['theme_test_array_suggestions_without_base'] = array(
-    'template' => 'theme-test-array-suggestions-without-base',
     'variables' => array(),
   );
   $items['theme_test_function_suggestions'] = array(
diff --git a/core/modules/system/tests/modules/theme_test/theme_test.routing.yml b/core/modules/system/tests/modules/theme_test/theme_test.routing.yml
index 9548cfb..eb378b2 100644
--- a/core/modules/system/tests/modules/theme_test/theme_test.routing.yml
+++ b/core/modules/system/tests/modules/theme_test/theme_test.routing.yml
@@ -107,13 +107,13 @@ theme_test.non_html:
 theme_test.array_suggestions_alter:
   path: '/theme-test/array-suggestions-alter'
   defaults:
-    _content: '\Drupal\theme_test\ThemeTestController::arraySuggestionsAlter'
+    _controller: '\Drupal\theme_test\ThemeTestController::arraySuggestionsAlter'
   requirements:
     _access: 'TRUE'
 
 theme_test.array_suggestions_without_base_alter:
   path: '/theme-test/array-suggestions-without-base-alter'
   defaults:
-    _content: '\Drupal\theme_test\ThemeTestController::arraySuggestionsWithoutBaseAlter'
+    _controller: '\Drupal\theme_test\ThemeTestController::arraySuggestionsWithoutBaseAlter'
   requirements:
     _access: 'TRUE'