diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Form/ViewsTestDataElementForm.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Form/ViewsTestDataElementForm.php
new file mode 100644
index 0000000..2d875cf
--- /dev/null
+++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Form/ViewsTestDataElementForm.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\views_test_data\Form\ViewsTestDataElementForm.
+ */
+
+namespace Drupal\views_test_data\Form;
+
+use Drupal\Core\Form\FormInterface;
+
+/**
+ * Simple form page callback to test the view element.
+ */
+class ViewsTestDataElementForm implements FormInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormID() {
+    return 'views_test_data_element_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, array &$form_state) {
+    $form['view'] = array(
+      '#type' => 'view',
+      '#name' => 'test_view',
+      '#display_id' => 'default',
+      '#arguments' => array(25),
+    );
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, array &$form_state) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, array &$form_state) {
+  }
+
+}
diff --git a/core/modules/views/tests/views_test_data/views_test_data.module b/core/modules/views/tests/views_test_data/views_test_data.module
index a4ae6e4..9dc5159 100644
--- a/core/modules/views/tests/views_test_data/views_test_data.module
+++ b/core/modules/views/tests/views_test_data/views_test_data.module
@@ -129,34 +129,3 @@ function template_preprocess_views_view_mapping_test(&$variables) {
 function theme_views_view_mapping_test($variables) {
   return drupal_render($variables['element']);
 }
-
-/**
- * Implements hook_menu().
- */
-function views_test_data_menu() {
-  $items = array();
-
-  $items['views_test_data_element_form'] = array(
-    'title' => 'Views test data element form',
-    'description' => 'Views test data element form callback',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('views_test_data_element_form'),
-    'access callback' => TRUE,
-  );
-
-  return $items;
-}
-
-/**
- * Simple form page callback to test the view element.
- */
-function views_test_data_element_form() {
-  $form['view'] = array(
-    '#type' => 'view',
-    '#name' => 'test_view',
-    '#display_id' => 'default',
-    '#arguments' => array(25),
-  );
-
-  return $form;
-}
diff --git a/core/modules/views/tests/views_test_data/views_test_data.routing.yml b/core/modules/views/tests/views_test_data/views_test_data.routing.yml
new file mode 100644
index 0000000..f022c68
--- /dev/null
+++ b/core/modules/views/tests/views_test_data/views_test_data.routing.yml
@@ -0,0 +1,6 @@
+views_test_data_element:
+  pattern: '/views_test_data_element_form'
+  defaults:
+    _form: '\Drupal\views_test_data\Form\ViewsTestDataElementForm'
+  requirements:
+    _access: 'TRUE'