diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php
index af1453a..84fd20e 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php
@@ -217,13 +217,13 @@ function testCRUDUI() {
     $this->assertResponse(200);
     $this->assertRaw($message_insert);
     $this->assertNoRaw($message_update);
-    $this->assertLinkByHref("admin/structure/config_test/manage/$id/edit");
+    $this->assertLinkByHref("admin/structure/config_test/manage/$id");
 
     // Update the configuration entity.
     $edit = array(
       'label' => $label2,
     );
-    $this->drupalPost("admin/structure/config_test/manage/$id/edit", $edit, 'Save');
+    $this->drupalPost("admin/structure/config_test/manage/$id", $edit, 'Save');
     $this->assertUrl('admin/structure/config_test');
     $this->assertResponse(200);
     $this->assertNoRaw($message_insert);
@@ -259,12 +259,13 @@ function testCRUDUI() {
       'id' => strtolower($this->randomName()),
       'label' => $label3,
     );
-    $this->drupalPost("admin/structure/config_test/manage/$id/edit", $edit, 'Save');
+    $this->drupalPost("admin/structure/config_test/manage/$id", $edit, 'Save');
     $this->assertUrl('admin/structure/config_test');
     $this->assertResponse(200);
     $this->assertNoText($label1);
     $this->assertNoText($label2);
     $this->assertText($label3);
+    $this->assertNoLinkByHref("admin/structure/config_test/manage/$id");
     $this->assertNoLinkByHref("admin/structure/config_test/manage/$id/edit");
     $id = $edit['id'];
     $this->assertLinkByHref("admin/structure/config_test/manage/$id/edit");
diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
index d7dd961..d144ac0 100644
--- a/core/modules/config/tests/config_test/config_test.module
+++ b/core/modules/config/tests/config_test/config_test.module
@@ -35,9 +35,12 @@ function config_test_menu() {
     'route_name' => 'config_test_entity_add',
     'type' => MENU_LOCAL_ACTION,
   );
+  $items['admin/structure/config_test/manage/%config_test'] = array(
+    'route_name' => 'config_test_entity_edit',
+  );
   $items['admin/structure/config_test/manage/%config_test/edit'] = array(
     'title' => 'Edit',
-    'route_name' => 'config_test_entity_edit',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
   );
   $items['admin/structure/config_test/manage/%config_test/delete'] = array(
     'title' => 'Delete',
diff --git a/core/modules/config/tests/config_test/config_test.routing.yml b/core/modules/config/tests/config_test/config_test.routing.yml
index b95aa91..7926998 100644
--- a/core/modules/config/tests/config_test/config_test.routing.yml
+++ b/core/modules/config/tests/config_test/config_test.routing.yml
@@ -13,6 +13,14 @@ config_test_entity_add:
   requirements:
     _access: 'TRUE'
 
+config_test_entity:
+  pattern: 'admin/structure/config_test/manage/{config_test}'
+  defaults:
+    _controller: '\Drupal\config_test\ConfigTestController::edit'
+    entity_type: 'config_test'
+  requirements:
+    _access: 'TRUE'
+
 config_test_entity_edit:
   pattern: 'admin/structure/config_test/manage/{config_test}/edit'
   defaults: