diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index ccf703e..c9f9859 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -774,7 +774,7 @@ function _menu_translate(&$router_item, $map, $to_arg = FALSE) {
     // Attempt to match this path to provide a fully built request to the
     // acccess checker.
     try {
-      $request->attributes->add(Drupal::service('router')->matchRequest($request));
+      $request->attributes->add(Drupal::service('router.dynamic')->matchRequest($request));
       $router_item['access'] = Drupal::service('access_manager')->check($route, $request);
     }
     catch (NotFoundHttpException $e) {
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
index 0232b21..f84ae07 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
@@ -271,7 +271,7 @@ private function doAdminTests($user) {
 
     // Add forum to the Tools menu.
     $edit = array();
-    $this->drupalPost('admin/structure/menu/manage/tools', $edit, t('Save'));
+    $this->drupalPost('admin/structure/menu/manage/tools/edit', $edit, t('Save'));
     $this->assertResponse(200);
 
     // Edit forum taxonomy.
diff --git a/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php b/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php
new file mode 100644
index 0000000..2ee5a9e
--- /dev/null
+++ b/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\menu\Controller\MenuController.
+ */
+
+namespace Drupal\menu\Controller;
+
+use Drupal\Core\ControllerInterface;
+use Drupal\Core\Entity\EntityManager;
+use Drupal\system\Plugin\Core\Entity\Menu;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Returns responses for Menu routes.
+ */
+class MenuController implements ControllerInterface {
+
+  /**
+   * The entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManager
+   */
+  protected $entityManager;
+
+  /**
+   * Constructs a new MenuController.
+   *
+   * @param \Drupal\Core\Entity\EntityManager $entity_manager
+   *  The entity manager.
+   */
+  public function __construct($entity_manager) {
+    $this->entityManager = $entity_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('plugin.manager.entity')
+    );
+  }
+
+  /**
+   * Shows an overview page of all the custom menus and their descriptions.
+   *
+   * @return array
+   *   A render array of the listing page.
+   */
+  public function overview() {
+    return $this->entityManager->getListController('menu')->render();
+  }
+
+  /**
+   * Gets all the available menus and menu items as a JavaScript array.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The request of the page.
+   *
+   * @return \Symfony\Component\HttpFoundation\JsonResponse
+   *   The available menu and menu items.
+   */
+  public function getParentOptions(Request $request) {
+    $available_menus = array();
+    if ($menus = $request->request->get('menus')) {
+      foreach ($menus as $menu) {
+        $available_menus[$menu] = $menu;
+      }
+    }
+    $options = _menu_get_options(menu_get_menus(), $available_menus, array('mlid' => 0));
+
+    return new JsonResponse($options);
+  }
+
+  /**
+   * Provides the menu link submission form.
+   *
+   * @param \Drupal\system\Plugin\Core\Entity\Menu $menu
+   *   An entity representing a custom menu.
+   *
+   * @return array
+   *   Returns the menu link submission form.
+   */
+  public function addLink(Menu $menu) {
+    $menu_link = $this->entityManager->getStorageController('menu_link')->create(array(
+      'mlid' => 0,
+      'plid' => 0,
+      'menu_name' => $menu->id(),
+    ));
+    return entity_get_form($menu_link);
+  }
+
+}
diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php b/core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php
index e00dbc7..20a3262 100644
--- a/core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php
+++ b/core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php
@@ -33,7 +33,7 @@ protected function getQuestion() {
    * {@inheritdoc}
    */
   protected function getCancelPath() {
-    return 'admin/structure/menu/manage/' . $this->menuLink->menu_name;
+    return 'admin/structure/menu/manage/' . $this->menuLink->menu_name . '/edit';
   }
 
   /**
@@ -60,6 +60,6 @@ public function submitForm(array &$form, array &$form_state) {
     $t_args = array('%title' => $this->menuLink->link_title);
     drupal_set_message(t('The menu link %title has been deleted.', $t_args));
     watchdog('menu', 'Deleted menu link %title.', $t_args, WATCHDOG_NOTICE);
-    $form_state['redirect'] = 'admin/structure/menu/manage/' . $this->menuLink->menu_name;
+    $form_state['redirect'] = 'admin/structure/menu/manage/' . $this->menuLink->menu_name . '/edit';
   }
 }
diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php b/core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php
index aa1165c..190dd11 100644
--- a/core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php
+++ b/core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php
@@ -72,6 +72,6 @@ public function buildForm(array $form, array &$form_state, MenuLink $menu_link =
   public function submitForm(array &$form, array &$form_state) {
     $new_menu_link = $this->menuLink->reset();
     drupal_set_message(t('The menu link was reset to its default settings.'));
-    $form_state['redirect'] = 'admin/structure/menu/manage/' . $new_menu_link->menu_name;
+    $form_state['redirect'] = 'admin/structure/menu/manage/' . $new_menu_link->menu_name . '/edit';
   }
 }
diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
index 4eeab27..62aaac1 100644
--- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php
+++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
@@ -8,6 +8,7 @@
 namespace Drupal\menu;
 
 use Drupal\Core\Entity\EntityFormController;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Base form controller for menu edit forms.
@@ -15,10 +16,15 @@
 class MenuFormController extends EntityFormController {
 
   /**
-   * Overrides Drupal\Core\Entity\EntityFormController::form().
+   * {@inheritdoc}
    */
   public function form(array $form, array &$form_state) {
     $form = parent::form($form, $form_state);
+
+    if ($this->operation == 'edit') {
+      drupal_set_title(t('Edit menu %label', array('%label' => $this->entity->label())), PASS_THROUGH);
+    }
+
     $menu = $this->entity;
     $system_menus = menu_list_system_menus();
     $form_state['menu'] = &$menu;
@@ -36,7 +42,7 @@ public function form(array $form, array &$form_state) {
       '#maxlength' => MENU_MAX_MENU_NAME_LENGTH_UI,
       '#description' => t('A unique name to construct the URL for the menu. It must only contain lowercase letters, numbers and hyphens.'),
       '#machine_name' => array(
-        'exists' => 'menu_edit_menu_name_exists',
+        'exists' => array($this, 'menuNameExists'),
         'source' => array('label'),
         'replace_pattern' => '[^a-z0-9-]+',
         'replace' => '-',
@@ -53,6 +59,7 @@ public function form(array $form, array &$form_state) {
 
     // Add menu links administration form for existing menus.
     if (!$menu->isNew() || isset($system_menus[$menu->id()])) {
+      form_load_include($form_state, 'admin.inc', 'menu');
       // Form API supports constructing and validating self-contained sections
       // within forms, but does not allow to handle the form section's submission
       // equally separated yet. Therefore, we use a $form_state key to point to
@@ -67,7 +74,27 @@ public function form(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides Drupal\Core\Entity\EntityFormController::actions().
+   * Returns whether a menu name already exists.
+   *
+   * @param string $value
+   *   The name of the menu.
+   *
+   * @return bool
+   *   Returns TRUE if the menu already exists.
+   *
+   * @see form_validate_machine_name()
+   */
+  public function menuNameExists($value) {
+    $custom_exists = entity_load('menu', $value);
+      // 'menu-' is added to the menu name to avoid name-space conflicts.
+    $value = 'menu-' . $value;
+    $link_exists = \Drupal::entityQuery('menu_link')->condition('menu_name', $value)->range(0,1)->count()->execute();
+
+    return $custom_exists || $link_exists;
+  }
+
+  /**
+   * {@inheritdoc}
    */
   protected function actions(array $form, array &$form_state) {
     $actions = parent::actions($form, $form_state);
@@ -80,7 +107,7 @@ protected function actions(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides Drupal\Core\Entity\EntityFormController::save().
+   * {@inheritdoc}
    */
   public function save(array $form, array &$form_state) {
     $menu = $this->entity;
@@ -107,11 +134,11 @@ public function save(array $form, array &$form_state) {
       watchdog('menu', 'Menu %label has been added.', array('%label' => $menu->label()), WATCHDOG_NOTICE, l(t('Edit'), $uri['path'] . '/edit'));
     }
 
-    $form_state['redirect'] = 'admin/structure/menu/manage/' . $menu->id();
+    $form_state['redirect'] = 'admin/structure/menu/manage/' . $menu->id() . '/edit';
   }
 
   /**
-   * Overrides Drupal\Core\Entity\EntityFormController::delete().
+   * {@inheritdoc}
    */
   public function delete(array $form, array &$form_state) {
     $menu = $this->entity;
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
index f3a4391..3a28a72 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
@@ -107,14 +107,14 @@ function addCustomMenuCRUD() {
     $menu->save();
 
     // Assert the new menu.
-    $this->drupalGet('admin/structure/menu/manage/' . $menu_name);
+    $this->drupalGet('admin/structure/menu/manage/' . $menu_name . '/edit');
     $this->assertRaw($label, 'Custom menu was added.');
 
     // Edit the menu.
     $new_label = $this->randomName(16);
     $menu->set('label', $new_label);
     $menu->save();
-    $this->drupalGet('admin/structure/menu/manage/' . $menu_name);
+    $this->drupalGet('admin/structure/menu/manage/' . $menu_name . '/edit');
     $this->assertRaw($new_label, 'Custom menu was edited.');
   }
 
@@ -256,7 +256,7 @@ function doMenuTests($menu_name) {
     // Note in the UI the 'links[mlid:x][hidden]' form element maps to enabled,
     // or NOT hidden.
     $edit['links[mlid:' . $item1['mlid'] . '][hidden]'] = TRUE;
-    $this->drupalPost('admin/structure/menu/manage/' . $item1['menu_name'], $edit, t('Save'));
+    $this->drupalPost('admin/structure/menu/manage/' . $item1['menu_name'] . '/edit', $edit, t('Save'));
 
     // Verify in the database.
     $this->assertMenuLink($item1['mlid'], array('hidden' => 0));
@@ -597,7 +597,7 @@ private function verifyAccess($response = 200, $menu_name = 'tools') {
     }
 
     // View tools menu customization node.
-    $this->drupalGet('admin/structure/menu/manage/' . $menu_name);
+    $this->drupalGet('admin/structure/menu/manage/' . $menu_name . '/edit');
         $this->assertResponse($response);
     if ($response == 200) {
       $this->assertText(t('Tools'), 'Tools menu node was displayed');
diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc
index 4150b99..ebaa22f 100644
--- a/core/modules/menu/menu.admin.inc
+++ b/core/modules/menu/menu.admin.inc
@@ -6,47 +6,7 @@
  */
 
 use Drupal\menu_link\Plugin\Core\Entity\MenuLink;
-use Drupal\system\Plugin\Core\Entity\Menu;
 use Drupal\Component\Utility\NestedArray;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-
-/**
- * Menu callback which shows an overview page of all the custom menus and their descriptions.
- */
-function menu_overview_page() {
-  return Drupal::entityManager()
-    ->getListController('menu')
-    ->render();
-}
-
-/**
- * Page callback: Presents the menu creation form.
- *
- * @return array
- *   A form array as expected by drupal_render().
- *
- * @see menu_menu()
- */
-function menu_menu_add() {
-  $menu = entity_create('menu', array());
-  return entity_get_form($menu);
-}
-
-/**
- * Page callback: Presents the menu edit form.
- *
- * @param \Drupal\system\Plugin\Core\Entity\Menu $menu
- *   The menu to edit.
- *
- * @return array
- *   A form array as expected by drupal_render().
- *
- * @see menu_menu()
- */
-function menu_menu_edit(Menu $menu) {
-  drupal_set_title(t('Edit menu %label', array('%label' => $menu->label())), PASS_THROUGH);
-  return entity_get_form($menu);
-}
 
 /**
  * Form constructor to edit an entire menu tree at once.
@@ -310,21 +270,6 @@ function theme_menu_overview_form($variables) {
 }
 
 /**
- * Returns whether a menu name already exists.
- *
- * @see menu_edit_menu()
- * @see form_validate_machine_name()
- */
-function menu_edit_menu_name_exists($value) {
-  $custom_exists = entity_load('menu', $value);
-  // 'menu-' is added to the menu name to avoid name-space conflicts.
-  $value = 'menu-' . $value;
-  $link_exists = Drupal::entityQuery('menu_link')->condition('menu_name', $value)->range(0,1)->count()->execute();
-
-  return $custom_exists || $link_exists;
-}
-
-/**
  * Submit function for adding or editing a custom menu.
  */
 function menu_edit_menu_submit($form, &$form_state) {
@@ -355,22 +300,3 @@ function menu_edit_menu_submit($form, &$form_state) {
   drupal_set_message(t('Your configuration has been saved.'));
   $form_state['redirect'] = $path . $menu['id'];
 }
-
-/**
- * Menu callback: Provides the menu link submission form.
- *
- * @param \Drupal\system\Plugin\Core\Entity\Menu $menu
- *   An entity representing a custom menu.
- *
- * @return
- *   Returns the menu link submission form.
- */
-function menu_link_add(Menu $menu) {
-  $menu_link = entity_create('menu_link', array(
-    'mlid' => 0,
-    'plid' => 0,
-    'menu_name' => $menu->id(),
-  ));
-  drupal_set_title(t('Add menu link'));
-  return entity_get_form($menu_link);
-}
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 93c2ed8..09ed36f 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -67,16 +67,7 @@ function menu_menu() {
   $items['admin/structure/menu'] = array(
     'title' => 'Menus',
     'description' => 'Add new menus to your site, edit existing menus, and rename and reorganize menu links.',
-    'page callback' => 'menu_overview_page',
-    'access callback' => 'user_access',
-    'access arguments' => array('administer menu'),
-    'file' => 'menu.admin.inc',
-  );
-  $items['admin/structure/menu/parents'] = array(
-    'title' => 'Parent menu items',
-    'page callback' => 'menu_parent_options_js',
-    'type' => MENU_CALLBACK,
-    'access arguments' => array(TRUE),
+    'route_name' => 'menu_overview_page',
   );
   $items['admin/structure/menu/list'] = array(
     'title' => 'List menus',
@@ -84,51 +75,42 @@ function menu_menu() {
   );
   $items['admin/structure/menu/add'] = array(
     'title' => 'Add menu',
-    'page callback' => 'menu_menu_add',
-    'access arguments' => array('administer menu'),
+    'route_name' => 'menu_add_menu',
     'type' => MENU_LOCAL_ACTION,
-    'file' => 'menu.admin.inc',
   );
   $items['admin/structure/menu/settings'] = array(
     'title' => 'Settings',
     'route_name' => 'menu_settings',
-    'access arguments' => array('administer menu'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 100,
   );
   $items['admin/structure/menu/manage/%menu'] = array(
     'title' => 'Edit menu',
-    'page callback' => 'menu_menu_edit',
-    'page arguments' => array(4),
-    'title callback' => 'entity_page_label',
-    'title arguments' => array(4),
-    'access arguments' => array('administer menu'),
-    'file' => 'menu.admin.inc',
+    'route_name' => 'menu_edit_menu',
   );
   // Not officially a local action, but displayed as such in
   // menu_overview_form().
   $items['admin/structure/menu/manage/%menu/add'] = array(
     'title' => 'Add menu link',
-    'page callback' => 'menu_link_add',
-    'page arguments' => array(4),
-    'access arguments' => array('administer menu'),
-    'file' => 'menu.admin.inc',
+    'route_name' => 'menu_link_add',
+    'tab_root' => 'admin/structure/menu/manage/%menu',
   );
   $items['admin/structure/menu/manage/%menu/edit'] = array(
     'title' => 'Edit menu',
+    'route_name' => 'menu_edit_menu',
     'type' => MENU_DEFAULT_LOCAL_TASK,
+    'tab_root' => 'admin/structure/menu/manage/%menu',
     'weight' => -10,
     'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
   );
   $items['admin/structure/menu/manage/%menu/delete'] = array(
     'title' => 'Delete menu',
     'route_name' => 'menu_delete_menu',
+    'tab_root' => 'admin/structure/menu/manage/%menu',
   );
   $items['admin/structure/menu/item/%menu_link/edit'] = array(
     'title' => 'Edit menu link',
-    'page callback' => 'entity_get_form',
-    'page arguments' => array(4),
-    'access arguments' => array('administer menu'),
+    'route_name' => 'menu_link_edit',
   );
   $items['admin/structure/menu/item/%menu_link/reset'] = array(
     'title' => 'Reset menu link',
@@ -148,7 +130,8 @@ function menu_entity_info_alter(&$entity_info) {
   $entity_info['menu']['controllers']['list'] = 'Drupal\menu\MenuListController';
   $entity_info['menu']['uri_callback'] = 'menu_uri';
   $entity_info['menu']['controllers']['form'] = array(
-    'default' => 'Drupal\menu\MenuFormController',
+    'add' => 'Drupal\menu\MenuFormController',
+    'edit' => 'Drupal\menu\MenuFormController',
   );
 }
 
@@ -337,22 +320,6 @@ function menu_parent_options(array $menus, MenuLink $menu_link = NULL, $type = N
 }
 
 /**
- * Page callback.
- * Get all the available menus and menu items as a JavaScript array.
- */
-function menu_parent_options_js() {
-  $available_menus = array();
-  if (isset($_POST['menus']) && count($_POST['menus'])) {
-    foreach ($_POST['menus'] as $menu) {
-      $available_menus[$menu] = $menu;
-    }
-  }
-  $options = _menu_get_options(menu_get_menus(), $available_menus, array('mlid' => 0));
-
-  return new JsonResponse($options);
-}
-
-/**
  * Helper function to get the items of the given menu.
  */
 function _menu_get_options($menus, $available_menus, $item) {
diff --git a/core/modules/menu/menu.routing.yml b/core/modules/menu/menu.routing.yml
index aafe5c3..02c13ab 100644
--- a/core/modules/menu/menu.routing.yml
+++ b/core/modules/menu/menu.routing.yml
@@ -5,6 +5,34 @@ menu_settings:
   requirements:
     _permission: 'administer menu'
 
+menu_overview_page:
+  pattern: '/admin/structure/menu'
+  defaults:
+    _content: '\Drupal\menu\Controller\MenuController::overview'
+  requirements:
+    _permission: 'administer menu'
+
+menu_parent_options_js:
+  pattern: '/admin/structure/menu/parents'
+  defaults:
+    _controller: '\Drupal\menu\Controller\MenuController::getParentOptions'
+  requirements:
+    _access: 'TRUE'
+
+menu_link_add:
+  pattern: '/admin/structure/menu/manage/{menu}/add'
+  defaults:
+    _content: '\Drupal\menu\Controller\MenuController::addLink'
+  requirements:
+    _permission: 'administer menu'
+
+menu_link_edit:
+  pattern: '/admin/structure/menu/item/{menu_link}/edit'
+  defaults:
+    _entity_form: 'menu_link'
+  requirements:
+    _permission: 'administer menu'
+
 menu_link_reset:
   pattern: 'admin/structure/menu/item/{menu_link}/reset'
   defaults:
@@ -19,6 +47,20 @@ menu_link_delete:
   requirements:
     _access_menu_delete_link: 'TRUE'
 
+menu_add_menu:
+  pattern: '/admin/structure/menu/add'
+  defaults:
+    _entity_form: 'menu.add'
+  requirements:
+    _permission: 'administer menu'
+
+menu_edit_menu:
+  pattern: '/admin/structure/menu/manage/{menu}/edit'
+  defaults:
+    _entity_form: 'menu.edit'
+  requirements:
+    _permission: 'administer menu'
+
 menu_delete_menu:
   pattern: 'admin/structure/menu/manage/{menu}/delete'
   defaults:
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
index 79bd8de..79ba04f 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
@@ -30,7 +30,7 @@ public function form(array $form, array &$form_state) {
 
       // Get the current breadcrumb and add a link to that menu's overview page.
       $breadcrumb = menu_get_active_breadcrumb();
-      $breadcrumb[] = l($current_title, 'admin/structure/menu/manage/' . $menu_link->menu_name);
+      $breadcrumb[] = l($current_title, 'admin/structure/menu/manage/' . $menu_link->menu_name . '/edit');
       drupal_set_breadcrumb($breadcrumb);
     }
 
@@ -208,7 +208,7 @@ public function save(array $form, array &$form_state) {
 
     if ($saved) {
       drupal_set_message(t('The menu link has been saved.'));
-      $form_state['redirect'] = 'admin/structure/menu/manage/' . $menu_link->menu_name;
+      $form_state['redirect'] = 'admin/structure/menu/manage/' . $menu_link->menu_name . '/edit';
     }
     else {
       drupal_set_message(t('There was an error saving the menu link.'), 'error');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
index 2801321..aee4ee1 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
@@ -111,7 +111,6 @@ function testBreadCrumbs() {
     $trail += array(
       'admin/structure/menu' => t('Menus'),
     );
-    $this->assertBreadcrumb('admin/structure/menu/manage/tools', $trail);
     $this->assertBreadcrumb('admin/structure/menu/manage/tools/edit', $trail);
 
     $mlid_node_add = db_query('SELECT mlid FROM {menu_links} WHERE link_path = :href AND module = :module', array(
@@ -119,7 +118,7 @@ function testBreadCrumbs() {
       ':module' => 'system',
     ))->fetchField();
     $trail += array(
-      'admin/structure/menu/manage/tools' => t('Tools'),
+      'admin/structure/menu/manage/tools/edit' => t('Tools'),
     );
     $this->assertBreadcrumb("admin/structure/menu/item/$mlid_node_add/edit", $trail);
     $this->assertBreadcrumb('admin/structure/menu/manage/tools/add', $trail);
@@ -141,7 +140,7 @@ function testBreadCrumbs() {
     );
     $this->assertBreadcrumb("admin/structure/types/manage/$type/display/teaser", $trail_teaser);
     $this->assertBreadcrumb("admin/structure/types/manage/$type/comment/fields", $trail);
-    $this->assertBreadcrumb("admin/structure/types/manage/$type/comment/display", $trail);
+    $this->assertBreadcrumb("admin/structure/Gtypes/manage/$type/comment/display", $trail);
     $this->assertBreadcrumb("admin/structure/types/manage/$type/delete", $trail);
     $trail += array(
       "admin/structure/types/manage/$type/fields" => t('Manage fields'),
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php b/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
index deec20e..2aca88a 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
@@ -75,7 +75,7 @@ function testDisabledAccountLink() {
     // Verify that the 'My account' link is enabled. Do not assume the value of
     // auto-increment is 1. Use XPath to obtain input element id and name using
     // the consistent label text.
-    $this->drupalGet('admin/structure/menu/manage/account');
+    $this->drupalGet('admin/structure/menu/manage/account/edit');
     $label = $this->xpath('//label[contains(.,:text)]/@for', array(':text' => 'Enable My account menu link'));
     $this->assertFieldChecked((string) $label[0], "The 'My account' link is enabled by default.");
 
@@ -84,7 +84,7 @@ function testDisabledAccountLink() {
     $edit = array(
       (string) $input[0] => FALSE,
     );
-    $this->drupalPost('admin/structure/menu/manage/account', $edit, t('Save'));
+    $this->drupalPost('admin/structure/menu/manage/account/edit', $edit, t('Save'));
 
     // Get the homepage.
     $this->drupalGet('<front>');