diff --git a/core/modules/system/src/Tests/Form/ElementsLabelsTest.php b/core/modules/system/src/Tests/Form/ElementsLabelsTest.php
index b002635..0018846 100644
--- a/core/modules/system/src/Tests/Form/ElementsLabelsTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsLabelsTest.php
@@ -34,7 +34,7 @@ public static function getInfo() {
    * correctly and have the correct label option class if needed.
    */
   function testFormLabels() {
-    $this->drupalGet('form_test/form-labels');
+    $this->drupalGet('form-test/form-labels');
 
     // Check that the checkbox/radio processing is not interfering with
     // basic placement.
diff --git a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
index 5bc8314..c82167e 100644
--- a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
@@ -34,7 +34,7 @@ public static function getInfo() {
    */
   function testMultipleTrue() {
 
-    $this->drupalGet('form_test/tableselect/multiple-true');
+    $this->drupalGet('form-test/tableselect/multiple-true');
 
     $this->assertNoText(t('Empty text.'), 'Empty text should not be displayed.');
 
@@ -51,7 +51,7 @@ function testMultipleTrue() {
    * Test the display of radios when #multiple is FALSE.
    */
   function testMultipleFalse() {
-    $this->drupalGet('form_test/tableselect/multiple-false');
+    $this->drupalGet('form-test/tableselect/multiple-false');
 
     $this->assertNoText(t('Empty text.'), 'Empty text should not be displayed.');
 
@@ -68,7 +68,7 @@ function testMultipleFalse() {
    * Tests the display when #colspan is set.
    */
   function testTableselectColSpan() {
-    $this->drupalGet('form_test/tableselect/colspan');
+    $this->drupalGet('form-test/tableselect/colspan');
 
     $this->assertText(t('Three'), 'Presence of the third column');
     $this->assertNoText(t('Four'), 'Absence of a fourth column');
@@ -93,7 +93,7 @@ function testTableselectColSpan() {
    * Test the display of the #empty text when #options is an empty array.
    */
   function testEmptyText() {
-    $this->drupalGet('form_test/tableselect/empty-text');
+    $this->drupalGet('form-test/tableselect/empty-text');
     $this->assertText(t('Empty text.'), 'Empty text should be displayed.');
   }
 
@@ -105,7 +105,7 @@ function testMultipleTrueSubmit() {
     // Test a submission with one checkbox checked.
     $edit = array();
     $edit['tableselect[row1]'] = TRUE;
-    $this->drupalPostForm('form_test/tableselect/multiple-true', $edit, 'Submit');
+    $this->drupalPostForm('form-test/tableselect/multiple-true', $edit, 'Submit');
 
     $this->assertText(t('Submitted: row1 = row1'), 'Checked checkbox row1');
     $this->assertText(t('Submitted: row2 = 0'), 'Unchecked checkbox row2.');
@@ -114,7 +114,7 @@ function testMultipleTrueSubmit() {
     // Test a submission with multiple checkboxes checked.
     $edit['tableselect[row1]'] = TRUE;
     $edit['tableselect[row3]'] = TRUE;
-    $this->drupalPostForm('form_test/tableselect/multiple-true', $edit, 'Submit');
+    $this->drupalPostForm('form-test/tableselect/multiple-true', $edit, 'Submit');
 
     $this->assertText(t('Submitted: row1 = row1'), 'Checked checkbox row1.');
     $this->assertText(t('Submitted: row2 = 0'), 'Unchecked checkbox row2.');
@@ -127,7 +127,7 @@ function testMultipleTrueSubmit() {
    */
   function testMultipleFalseSubmit() {
     $edit['tableselect'] = 'row1';
-    $this->drupalPostForm('form_test/tableselect/multiple-false', $edit, 'Submit');
+    $this->drupalPostForm('form-test/tableselect/multiple-false', $edit, 'Submit');
     $this->assertText(t('Submitted: row1'), 'Selected radio button');
   }
 
@@ -136,18 +136,18 @@ function testMultipleFalseSubmit() {
    */
   function testAdvancedSelect() {
     // When #multiple = TRUE a Select all checkbox should be displayed by default.
-    $this->drupalGet('form_test/tableselect/advanced-select/multiple-true-default');
+    $this->drupalGet('form-test/tableselect/advanced-select/multiple-true-default');
     $this->assertFieldByXPath('//th[@class="select-all"]', NULL, 'Display a "Select all" checkbox by default when #multiple is TRUE.');
 
     // When #js_select is set to FALSE, a "Select all" checkbox should not be displayed.
-    $this->drupalGet('form_test/tableselect/advanced-select/multiple-true-no-advanced-select');
+    $this->drupalGet('form-test/tableselect/advanced-select/multiple-true-no-advanced-select');
     $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL, 'Do not display a "Select all" checkbox when #js_select is FALSE.');
 
     // A "Select all" checkbox never makes sense when #multiple = FALSE, regardless of the value of #js_select.
-    $this->drupalGet('form_test/tableselect/advanced-select/multiple-false-default');
+    $this->drupalGet('form-test/tableselect/advanced-select/multiple-false-default');
     $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL, 'Do not display a "Select all" checkbox when #multiple is FALSE.');
 
-    $this->drupalGet('form_test/tableselect/advanced-select/multiple-false-advanced-select');
+    $this->drupalGet('form-test/tableselect/advanced-select/multiple-false-advanced-select');
     $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL, 'Do not display a "Select all" checkbox when #multiple is FALSE, even when #js_select is TRUE.');
   }
 
diff --git a/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php b/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
index 303b5a9..d468772 100644
--- a/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
@@ -43,7 +43,7 @@ function setUp() {
    * Otherwise, collapse.js adds "SHOW" or "HIDE" labels to the tabs.
    */
   function testJavaScriptOrdering() {
-    $this->drupalGet('form_test/vertical-tabs');
+    $this->drupalGet('form-test/vertical-tabs');
     $position1 = strpos($this->content, 'core/misc/vertical-tabs.js');
     $position2 = strpos($this->content, 'core/misc/collapse.js');
     $this->assertTrue($position1 !== FALSE && $position2 !== FALSE && $position1 < $position2, 'vertical-tabs.js is included before collapse.js');
@@ -54,13 +54,13 @@ function testJavaScriptOrdering() {
    */
   function testWrapperNotShownWhenEmpty() {
     // Test admin user can see vertical tabs and wrapper.
-    $this->drupalGet('form_test/vertical-tabs');
+    $this->drupalGet('form-test/vertical-tabs');
     $wrapper = $this->xpath("//div[@data-vertical-tabs-panes]");
     $this->assertTrue(isset($wrapper[0]), 'Vertical tab panes found.');
 
     // Test wrapper markup not present for non-privileged web user.
     $this->drupalLogin($this->web_user);
-    $this->drupalGet('form_test/vertical-tabs');
+    $this->drupalGet('form-test/vertical-tabs');
     $wrapper = $this->xpath("//div[@data-vertical-tabs-panes]");
     $this->assertFalse(isset($wrapper[0]), 'Vertical tab wrappers are not displayed to unprivileged users.');
   }
diff --git a/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php b/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php
index 0157e7a..c45892e 100644
--- a/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php
+++ b/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php
@@ -50,7 +50,7 @@ function testFormStateValuesCleanAdvanced() {
     $edit = array('files[image]' => drupal_realpath($this->image->uri));
 
     // Post the form.
-    $this->drupalPostForm('form_test/form-state-values-clean-advanced', $edit, t('Submit'));
+    $this->drupalPostForm('form-test/form-state-values-clean-advanced', $edit, t('Submit'));
 
     // Expecting a 200 HTTP code.
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
diff --git a/core/modules/system/src/Tests/Form/StateValuesCleanTest.php b/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
index da5cdeb..f1155f5 100644
--- a/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
+++ b/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
@@ -34,7 +34,7 @@ public static function getInfo() {
    * Tests form_state_values_clean().
    */
   function testFormStateValuesClean() {
-    $values = Json::decode($this->drupalPostForm('form_test/form-state-values-clean', array(), t('Submit')));
+    $values = Json::decode($this->drupalPostForm('form-test/form-state-values-clean', array(), t('Submit')));
 
     // Setup the expected result.
     $result = array(
diff --git a/core/modules/system/src/Tests/Form/StorageTest.php b/core/modules/system/src/Tests/Form/StorageTest.php
index a723143..d6198f7 100644
--- a/core/modules/system/src/Tests/Form/StorageTest.php
+++ b/core/modules/system/src/Tests/Form/StorageTest.php
@@ -46,7 +46,7 @@ function setUp() {
    * Tests using the form in a usual way.
    */
   function testForm() {
-    $this->drupalGet('form_test/form-storage');
+    $this->drupalGet('form-test/form-storage');
     $this->assertText('Form constructions: 1');
 
     $edit = array('title' => 'new', 'value' => 'value_is_set');
@@ -72,7 +72,7 @@ function testForm() {
    * Tests using the form with an activated $form_state['cache'] property.
    */
   function testFormCached() {
-    $this->drupalGet('form_test/form-storage', array('query' => array('cache' => 1)));
+    $this->drupalGet('form-test/form-storage', array('query' => array('cache' => 1)));
     $this->assertText('Form constructions: 1');
 
     $edit = array('title' => 'new', 'value' => 'value_is_set');
@@ -96,7 +96,7 @@ function testFormCached() {
    * Tests validation when form storage is used.
    */
   function testValidation() {
-    $this->drupalPostForm('form_test/form-storage', array('title' => '', 'value' => 'value_is_set'), 'Continue submit');
+    $this->drupalPostForm('form-test/form-storage', array('title' => '', 'value' => 'value_is_set'), 'Continue submit');
     $this->assertPattern('/value_is_set/', 'The input values have been kept.');
   }
 
@@ -112,7 +112,7 @@ function testValidation() {
    */
   function testCachedFormStorageValidation() {
     // Request the form with 'cache' query parameter to enable form caching.
-    $this->drupalGet('form_test/form-storage', array('query' => array('cache' => 1)));
+    $this->drupalGet('form-test/form-storage', array('query' => array('cache' => 1)));
 
     // Skip step 1 of the multi-step form, since the first step copies over
     // 'title' into form storage, but we want to verify that changes in the form
diff --git a/core/modules/system/tests/modules/form_test/form_test.routing.yml b/core/modules/system/tests/modules/form_test/form_test.routing.yml
index c94f4db..1996f6a 100644
--- a/core/modules/system/tests/modules/form_test/form_test.routing.yml
+++ b/core/modules/system/tests/modules/form_test/form_test.routing.yml
@@ -117,7 +117,7 @@ form_test.pattern:
     _access: 'TRUE'
 
 form_test.tableselect_checkboxes:
-  path: '/form_test/tableselect/multiple-true'
+  path: '/form-test/tableselect/multiple-true'
   defaults:
     _form: '\Drupal\form_test\FormTestTableSelectMultipleTrueForm'
     _title: 'Tableselect checkboxes test'
@@ -125,7 +125,7 @@ form_test.tableselect_checkboxes:
     _access: 'TRUE'
 
 form_test.tableselect_radios:
-  path: '/form_test/tableselect/multiple-false'
+  path: '/form-test/tableselect/multiple-false'
   defaults:
     _form: '\Drupal\form_test\FormTestTableSelectMultipleFalseForm'
     _title: 'Tableselect radio button test'
@@ -133,7 +133,7 @@ form_test.tableselect_radios:
     _access: 'TRUE'
 
 form_test.tableselect_colspan:
-  path: '/form_test/tableselect/colspan'
+  path: '/form-test/tableselect/colspan'
   defaults:
     _form: '\Drupal\form_test\FormTestTableSelectColspanForm'
     _title: 'Tableselect colspan test'
@@ -141,7 +141,7 @@ form_test.tableselect_colspan:
     _access: 'TRUE'
 
 form_test.tableselect_empty_text:
-  path: '/form_test/tableselect/empty-text'
+  path: '/form-test/tableselect/empty-text'
   defaults:
     _form: '\Drupal\form_test\FormTestTableSelectEmptyForm'
     _title: 'Tableselect empty text test'
@@ -149,7 +149,7 @@ form_test.tableselect_empty_text:
     _access: 'TRUE'
 
 form_test.tableselect_js:
-  path: '/form_test/tableselect/advanced-select/{test_action}'
+  path: '/form-test/tableselect/advanced-select/{test_action}'
   defaults:
     _form: '\Drupal\form_test\FormTestTableSelectJsSelectForm'
     _title: 'Tableselect js_select tests'
@@ -157,7 +157,7 @@ form_test.tableselect_js:
     _access: 'TRUE'
 
 form_test.vertical_tabs:
-  path: '/form_test/vertical-tabs'
+  path: '/form-test/vertical-tabs'
   defaults:
     _form: '\Drupal\form_test\FormTestVerticalTabsForm'
     _title: 'Vertical tabs tests'
@@ -165,7 +165,7 @@ form_test.vertical_tabs:
     _access: 'TRUE'
 
 form_test.storage:
-  path: '/form_test/form-storage'
+  path: '/form-test/form-storage'
   defaults:
     _content: '\Drupal\form_test\Form\FormTestForm::testStorage'
     _title: 'Form storage test'
@@ -173,7 +173,7 @@ form_test.storage:
     _access: 'TRUE'
 
 form_test.state_clean:
-  path: '/form_test/form-state-values-clean'
+  path: '/form-test/form-state-values-clean'
   defaults:
     _content: '\Drupal\form_test\Form\FormTestForm::testFormStateClean'
     _title: 'Form state values clearance test'
@@ -181,7 +181,7 @@ form_test.state_clean:
     _access: 'TRUE'
 
 form_test.state_clean_advanced:
-  path: '/form_test/form-state-values-clean-advanced'
+  path: '/form-test/form-state-values-clean-advanced'
   defaults:
     _content: '\Drupal\form_test\Form\FormTestForm::testFormStateCleanAdvanced'
     _title: 'Form state values clearance advanced test'
@@ -326,7 +326,7 @@ form_test.redirect:
     _access: 'TRUE'
 
 form_test.label:
-  path: '/form_test/form-labels'
+  path: '/form-test/form-labels'
   defaults:
     _content: '\Drupal\form_test\Form\FormTestForm::testLabel'
     _title: 'Form label test'