diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
index 7b4d95e8a9abe7cea33558f7059e8534032f9b8f..169cf890e9d27d058ac57eabcbb4f3ca004deb77 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\config_test;
 
+use Drupal\Core\Controller\ControllerBase;
 use Drupal\config_test\Entity\ConfigTest;
 use Drupal\Component\Utility\String;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -15,7 +16,7 @@
 /**
  * Route controller class for the config_test module.
  */
-class ConfigTestController {
+class ConfigTestController extends ControllerBase {
 
   /**
    * Presents the ConfigTest edit form.
@@ -27,8 +28,9 @@ class ConfigTestController {
    *   A form array as expected by drupal_render().
    */
   public function edit(ConfigTest $config_test) {
-    drupal_set_title(String::format('Edit %label', array('%label' => $config_test->label())), PASS_THROUGH);
-    return \Drupal::entityManager()->getForm($config_test);
+    $form = $this->entityManager()->getForm($config_test);
+    $form['#title'] = String::format('Edit %label', array('%label' => $config_test->label()));
+    return $form;
   }
 
   /**