diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
index 7749c12..774c0b9 100644
--- a/core/modules/config/tests/config_test/config_test.module
+++ b/core/modules/config/tests/config_test/config_test.module
@@ -33,9 +33,8 @@ function config_test_menu() {
   );
   $items['admin/structure/config_test/add'] = array(
     'title' => 'Add test configuration',
-    'page callback' => 'config_test_add_page',
-    'access callback' => TRUE,
     'type' => MENU_LOCAL_ACTION,
+    'route_name' => 'config_test_add',
   );
   $items['admin/structure/config_test/manage/%config_test'] = array(
     'title' => 'Edit test configuration',
@@ -89,17 +88,6 @@ function config_test_list_page() {
 }
 
 /**
- * Page callback: Presents the ConfigTest creation form.
- *
- * @return array
- *   A form array as expected by drupal_render().
- */
-function config_test_add_page() {
-  $entity = entity_create('config_test', array());
-  return entity_get_form($entity);
-}
-
-/**
  * Page callback: Presents the ConfigTest edit form.
  *
  * @param Drupal\config_test\Plugin\Core\Entity\ConfigTest $config_test
diff --git a/core/modules/config/tests/config_test/config_test.routing.yml b/core/modules/config/tests/config_test/config_test.routing.yml
new file mode 100644
index 0000000..2251945
--- /dev/null
+++ b/core/modules/config/tests/config_test/config_test.routing.yml
@@ -0,0 +1,6 @@
+config_test_add:
+  pattern: '/admin/structure/config_test/add'
+  defaults:
+    _content: '\Drupal\config_test\Controller\ConfigTestController::addConfigTest'
+  requirements:
+    _access: 'TRUE'
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Controller/ConfigTestController.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Controller/ConfigTestController.php
new file mode 100644
index 0000000..d7f855f
--- /dev/null
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Controller/ConfigTestController.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\config_test\Controller\ConfigTestController.
+ */
+
+namespace Drupal\config_test\Controller;
+
+use Drupal\Core\ControllerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Controller routines for config_test routes.
+ */
+class ConfigTestController implements ControllerInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static();
+  }
+
+  /**
+   * Constructs a ConfigTestController object.
+   */
+  public function __construct() {
+  }
+
+  /**
+   * Page callback: Presents the ConfigTest creation form.
+   *
+   * @return array
+   *   A form array as expected by drupal_render().
+   */
+  public function addConfigTest() {
+    $entity = entity_create('config_test', array());
+    return entity_get_form($entity);
+  }
+}