diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index dbe2389..3cec6e4 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -6,7 +6,7 @@
  */
 
 use Symfony\Component\HttpFoundation\Request;
-
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Template\Attribute;
@@ -771,8 +771,15 @@ function _menu_translate(&$router_item, $map, $to_arg = FALSE) {
     $route = $route_provider->getRouteByName($router_item['route_name']);
     $request = Request::create('/' . $router_item['href']);
     $request->attributes->set('system_path', $router_item['href']);
-    $request->attributes->add(Drupal::service('router')->matchRequest($request));
-    $router_item['access'] = Drupal::service('access_manager')->check($route, $request);
+    // Attempt to match this path to provide a fully built request to the
+    // acccess checker.
+    try {
+      $request->attributes->add(Drupal::service('router')->matchRequest($request));
+      $router_item['access'] = Drupal::service('access_manager')->check($route, $request);
+    }
+    catch (NotFoundHttpException $e) {
+      $router_item['access'] = FALSE;
+    }
   }
   else {
     // @todo: Remove once all routes are converted.
diff --git a/core/modules/block/custom_block/custom_block.admin.inc b/core/modules/block/custom_block/custom_block.admin.inc
index 44af8c4..5d0026f 100644
--- a/core/modules/block/custom_block/custom_block.admin.inc
+++ b/core/modules/block/custom_block/custom_block.admin.inc
@@ -20,34 +20,6 @@ function custom_block_type_list() {
 }
 
 /**
- * Page callback: Presents the custom block type creation form.
- *
- * @return array
- *   A form array as expected by drupal_render().
- *
- * @see custom_block_menu()
- */
-function custom_block_type_add() {
-  $block_type = entity_create('custom_block_type', array());
-  return entity_get_form($block_type);
-}
-
-/**
- * Page callback: Presents the custom block type edit form.
- *
- * @param \Drupal\custom_block\Plugin\Core\Entity\CustomBlockType $block_type
- *   The custom block type to edit.
- *
- * @return array
- *   A form array as expected by drupal_render().
- *
- * @see custom_block_menu()
- */
-function custom_block_type_edit(CustomBlockType $block_type) {
-  return entity_get_form($block_type);
-}
-
-/**
  * Page callback: Form constructor for the custom block type deletion form.
  *
  * @param \Drupal\custom_block\Plugin\Core\Entity\CustomBlockType $block_type
diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module
index adf9f0f..e358d64 100644
--- a/core/modules/block/custom_block/custom_block.module
+++ b/core/modules/block/custom_block/custom_block.module
@@ -42,20 +42,13 @@ function custom_block_menu() {
   );
   $items['admin/structure/custom-blocks/add'] = array(
     'title' => 'Add custom block type',
-    'page callback' => 'custom_block_type_add',
-    'access arguments' => array('administer blocks'),
     'type' => MENU_LOCAL_ACTION,
     'weight' => 1,
-    'file' => 'custom_block.admin.inc',
+    'route_name' => 'custom_block_type_add',
   );
   $items['admin/structure/custom-blocks/manage/%custom_block_type'] = array(
     'title' => 'Edit custom block type',
-    'title callback' => 'entity_page_label',
-    'title arguments' => array(4),
-    'page callback' => 'custom_block_type_edit',
-    'page arguments' => array(4),
-    'access arguments' => array('administer blocks'),
-    'file' => 'custom_block.admin.inc',
+    'route_name' => 'custom_block_type_edit',
   );
   $items['admin/structure/custom-blocks/manage/%custom_block_type/edit'] = array(
     'title' => 'Edit',
@@ -88,11 +81,7 @@ function custom_block_menu() {
   // There has to be a base-item in order for contextual links to work.
   $items['block/%custom_block'] = array(
     'title' => 'Edit',
-    'page callback' => 'custom_block_edit',
-    'page arguments' => array(1),
-    'access callback' => 'entity_page_access',
-    'access arguments' => array(1, 'update'),
-    'file' => 'custom_block.pages.inc',
+    'route_name' => 'custom_block_edit',
   );
   $items['block/%custom_block/edit'] = array(
     'title' => 'Edit',
@@ -261,7 +250,7 @@ function custom_block_form_block_plugin_ui_alter(&$form, $form_state) {
     $custom_block = entity_load_by_uuid('custom_block', $derivative);
     $row['1']['data']['#links']['edit'] = array(
       'title' => t('Edit'),
-      'href' => 'block/' . $custom_block->id() . '/edit'
+      'href' => 'block/' . $custom_block->id(),
     );
   }
 }
diff --git a/core/modules/block/custom_block/custom_block.pages.inc b/core/modules/block/custom_block/custom_block.pages.inc
index 9c802c4..d863a4d 100644
--- a/core/modules/block/custom_block/custom_block.pages.inc
+++ b/core/modules/block/custom_block/custom_block.pages.inc
@@ -62,23 +62,7 @@ function custom_block_add(CustomBlockType $block_type) {
     // newly created block in the given theme.
     $block->setTheme($theme);
   }
-  return entity_get_form($block);
-}
-
-/**
- * Page callback: Presents the custom block edit form.
- *
- * @param Drupal\custom_block\Plugin\Core\Entity\CustomBlock $block
- *   The custom block to edit.
- *
- * @return array
- *   A form array as expected by drupal_render().
- *
- * @see custom_block_menu()
- */
-function custom_block_edit(CustomBlock $block) {
-  drupal_set_title(t('Edit custom block %label', array('%label' => $block->label())), PASS_THROUGH);
-  return entity_get_form($block);
+  return entity_get_form($block, 'add');
 }
 
 /**
diff --git a/core/modules/block/custom_block/custom_block.routing.yml b/core/modules/block/custom_block/custom_block.routing.yml
index ed4ab92..2af487a 100644
--- a/core/modules/block/custom_block/custom_block.routing.yml
+++ b/core/modules/block/custom_block/custom_block.routing.yml
@@ -1,6 +1,28 @@
 custom_block_add_page:
-  pattern: block/add
+  pattern: '/block/add'
   defaults:
     _content: 'Drupal\custom_block\Controller\CustomBlockController::add'
   requirements:
     _permission: 'administer blocks'
+
+custom_block_edit:
+  pattern: '/block/{custom_block}'
+  defaults:
+    _entity_form: 'custom_block.edit'
+  requirements:
+    _entity_access: 'custom_block.update'
+    custom_block: \d+
+
+custom_block_type_add:
+  pattern: '/admin/structure/custom-blocks/add'
+  defaults:
+    _entity_form: 'custom_block_type.add'
+  requirements:
+    _permission: 'administer blocks'
+
+custom_block_type_edit:
+  pattern: '/admin/structure/custom-blocks/manage/{custom_block_type}'
+  defaults:
+    _entity_form: 'custom_block_type.edit'
+  requirements:
+    _permission: 'administer blocks'
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php
index 1a09dbf..e0e0c99 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php
@@ -42,6 +42,11 @@ protected function prepareEntity() {
    */
   public function form(array $form, array &$form_state) {
     $block = $this->entity;
+
+    if ($this->operation == 'edit') {
+      // @todo Remove this once https://drupal.org/node/1981644 is in.
+      drupal_set_title(t('Edit custom block %label', array('%label' => $block->label())), PASS_THROUGH);
+    }
     // Override the default CSS class name, since the user-defined custom block
     // type name in 'TYPE-block-form' potentially clashes with third-party class
     // names.
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php
index 6e5de33..850ea7f 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php
@@ -21,6 +21,11 @@ public function form(array $form, array &$form_state) {
     $form = parent::form($form, $form_state);
 
     $block_type = $this->entity;
+
+    if ($this->operation == 'edit') {
+      // @todo Remove this once https://drupal.org/node/1981644 is in.
+      drupal_set_title(t('@label', array('@label' => $block_type->label())));
+    }
     $form['label'] = array(
       '#type' => 'textfield',
       '#title' => t('Label'),
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php
index 3c1dce6..f53365b 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php
@@ -25,7 +25,9 @@
  *     "access" = "Drupal\custom_block\CustomBlockAccessController",
  *     "render" = "Drupal\custom_block\CustomBlockRenderController",
  *     "form" = {
- *       "default" = "Drupal\custom_block\CustomBlockFormController"
+ *       "default" = "Drupal\custom_block\CustomBlockFormController",
+ *       "add" = "Drupal\custom_block\CustomBlockFormController",
+ *       "edit" = "Drupal\custom_block\CustomBlockFormController"
  *     },
  *     "translation" = "Drupal\custom_block\CustomBlockTranslationController"
  *   },
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php
index e4d3ab2..2b565a5 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php
@@ -22,7 +22,8 @@
  *   controllers = {
  *     "storage" = "Drupal\custom_block\CustomBlockTypeStorageController",
  *     "form" = {
- *       "default" = "Drupal\custom_block\CustomBlockTypeFormController"
+ *       "add" = "Drupal\custom_block\CustomBlockTypeFormController",
+ *       "edit" = "Drupal\custom_block\CustomBlockTypeFormController"
  *     },
  *     "list" = "Drupal\custom_block\CustomBlockTypeListController"
  *   },
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/PageEditTest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/PageEditTest.php
index 8b8a827..b796e25 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/PageEditTest.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/PageEditTest.php
@@ -44,7 +44,7 @@ public function testPageEdit() {
     $this->assertTrue($block, 'Custom block found in database.');
 
     // Load the edit page.
-    $this->drupalGet('block/' . $block->id() . '/edit');
+    $this->drupalGet('block/' . $block->id());
     $this->assertFieldByName($title_key, $edit[$title_key], 'Title field displayed.');
     $this->assertFieldByName($body_key, $edit[$body_key], 'Body field displayed.');
 
@@ -56,7 +56,7 @@ public function testPageEdit() {
     $this->drupalPost(NULL, $edit, t('Save'));
 
     // Edit the same block, creating a new revision.
-    $this->drupalGet("block/" . $block->id() . "/edit");
+    $this->drupalGet("block/" . $block->id());
     $edit = array();
     $edit['info'] = $this->randomName(8);
     $edit[$body_key] = $this->randomName(16);
@@ -68,7 +68,7 @@ public function testPageEdit() {
     $this->assertNotIdentical($block->revision_id->value, $revised_block->revision_id->value, 'A new revision has been created.');
 
     // Test deleting the block.
-    $this->drupalGet("block/" . $revised_block->id() . "/edit");
+    $this->drupalGet("block/" . $revised_block->id());
     $this->drupalPost(NULL, array(), t('Delete'));
     $this->assertText(format_string('Are you sure you want to delete !label?', array('!label' => $revised_block->label())));
   }
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php
index 6597d96..e401abf 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php
@@ -120,6 +120,10 @@ function testDefaultViews() {
     // Ensure the view is no longer listed.
     $this->assertUrl('admin/structure/views');
     $this->assertNoLinkByHref($edit_href);
+    // Ensure the view is no longer available.
+    $this->drupalGet($edit_href);
+    $this->assertResponse(404);
+    $this->assertText('Page not found');
   }
 
   /**