diff --git a/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php b/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php
index d4180ed..37651dc 100644
--- a/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php
+++ b/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php
@@ -163,7 +163,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
    * {@inheritdoc}
    */
   public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->doValidate($form, $form_state);
+    $this->validateForm($form, $form_state);
   }
 
   /**
@@ -244,15 +244,6 @@ protected function actions(array $form, FormStateInterface $form_state) {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    $this->doValidate($form, $form_state);
-
-    parent::validate($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function buildEntity(array $form, FormStateInterface $form_state) {
     /** @var \Drupal\menu_link_content\MenuLinkContentInterface $entity */
     $entity = parent::buildEntity($form, $form_state);
@@ -287,23 +278,4 @@ public function save(array $form, FormStateInterface $form_state) {
     }
   }
 
-  /**
-   * Validates the form, both on the menu link edit and content menu link form.
-   *
-   * $form is not currently used, but passed here to match the normal form
-   * validation method signature.
-   *
-   * @param array $form
-   *   A nested array form elements comprising the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  protected function doValidate(array $form, FormStateInterface $form_state) {
-    $extracted = $this->pathValidator->getUrlIfValid($form_state->getValue(['link', 0, 'uri']));
-
-    if (!$extracted) {
-      $form_state->setErrorByName('link][0][uri', $this->t("The path '@link_path' is either invalid or you do not have access to it.", array('@link_path' => $form_state->getValue(['link', 0, 'uri']))));
-    }
-  }
-
 }
diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module
index 12ebd6f..083d4d6 100644
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -162,9 +162,7 @@ function menu_ui_node_save(EntityInterface $node) {
         $entity = entity_create('menu_link_content', array(
           'title' => trim($definition['title']),
           'description' => trim($definition['description']),
-          // @todo Use entity: in the URI.
-          //   https://www.drupal.org/node/2417367
-          'link' => ['uri' => 'node/' . $node->id()],
+          'link' => ['uri' => 'entity:node/' . $node->id()],
           'menu_name' => $definition['menu_name'],
           'parent' => $definition['parent'],
           'weight' => isset($definition['weight']) ? $definition['weight'] : 0,
@@ -214,7 +212,7 @@ function menu_ui_node_prepare_form(NodeInterface $node, $operation, FormStateInt
       if (in_array($menu_name, $type_menus)) {
         $query = \Drupal::entityQuery('menu_link_content')
           // @todo Use link.uri once https://www.drupal.org/node/2391217 is in.
-          ->condition('link__uri', 'node/' . $node->id())
+          ->condition('link__uri', 'entity:node/' . $node->id())
           ->condition('menu_name', $menu_name)
           ->sort('id', 'ASC')
           ->range(0, 1);
@@ -226,7 +224,7 @@ function menu_ui_node_prepare_form(NodeInterface $node, $operation, FormStateInt
       if (!$id && !empty($type_menus)) {
         $query = \Drupal::entityQuery('menu_link_content')
           // @todo Use link.uri once https://www.drupal.org/node/2391217 is in.
-          ->condition('link__uri', 'node/' . $node->id())
+          ->condition('link__uri', 'entity:node/' . $node->id())
           ->condition('menu_name', array_values($type_menus), 'IN')
           ->sort('id', 'ASC')
           ->range(0, 1);
diff --git a/core/modules/menu_ui/src/Tests/MenuNodeTest.php b/core/modules/menu_ui/src/Tests/MenuNodeTest.php
index 99798d6..144d26a 100644
--- a/core/modules/menu_ui/src/Tests/MenuNodeTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuNodeTest.php
@@ -131,7 +131,7 @@ function testMenuNodeFormWidget() {
     // Add a menu link to the Administration menu.
     $item = entity_create('menu_link_content', array(
       'route_name' => 'entity.node.canonical',
-      'route_parameters' => array('node' => $node->id()),
+      'link' => ['uri' => 'entity:node/' . $node->id()],
       'title' => $this->randomMachineName(16),
       'menu_name' => 'admin',
     ));
@@ -154,12 +154,13 @@ function testMenuNodeFormWidget() {
     // Assign a menu link to the second node, being a child of the first one.
     $child_item = entity_create('menu_link_content', array(
       'route_name' => 'entity.node.canonical',
-      'route_parameters' => array('node' => $child_node->id()),
+      'link' => ['uri' => 'entity:node/' . $node->id()],
       'title' => $this->randomMachineName(16),
       'parent' => $item->getPluginId(),
       'menu_name' => $item->getMenuName(),
     ));
     $child_item->save();
+    MenuLinkContent::load($child_item->id());
     // Edit the first node.
     $this->drupalGet('node/'. $node->id() .'/edit');
     // Assert that it is not possible to set the parent of the first node to itself or the second node.
diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php
index 8763132..ccbdc62 100644
--- a/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuTest.php
@@ -106,7 +106,7 @@ function testMenu() {
 
     foreach ($this->items as $item) {
       // Paths were set as 'node/$nid'.
-      $node = Node::load(str_replace('user-path:node/', '', $item->link->uri));
+      $node = Node::load(str_replace('entity:node/', '', $item->link->uri));
       $this->verifyMenuLink($item, $node);
     }