diff --git a/core/modules/system/src/Tests/Menu/MenuRouterTest.php b/core/modules/system/src/Tests/Menu/MenuRouterTest.php
index 58a44b8..4089931 100644
--- a/core/modules/system/src/Tests/Menu/MenuRouterTest.php
+++ b/core/modules/system/src/Tests/Menu/MenuRouterTest.php
@@ -160,8 +160,7 @@ protected function doTestMenuHierarchy() {
     $menu_links = $menu_link_manager->loadLinksByRoute('menu_test.hierarchy_parent_child2');
     $unattached_child_link = reset($menu_links);
     $this->assertEqual($child_link->getParent(), $parent_link->getPluginId(), 'The parent of a directly attached child is correct.');
-    // @todo should a 3rd-level link have the top parent, or just it's direct parent?
-    $this->assertEqual($unattached_child_link->getParent(), $parent_link->getPluginId(), 'The parent of a non-directly attached child is correct.');
+    $this->assertEqual($unattached_child_link->getParent(), $child_link->getPluginId(), 'The parent of a non-directly attached child is correct.');
   }
 
   /**
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.links.menu.yml b/core/modules/system/tests/modules/menu_test/menu_test.links.menu.yml
index a1770f3..914fbd5 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.links.menu.yml
+++ b/core/modules/system/tests/modules/menu_test/menu_test.links.menu.yml
@@ -29,7 +29,7 @@ menu_test.hierarchy_parent.child:
 menu_test.hierarchy_parent.child2.child:
   title: 'Unattached subchild router'
   route_name: menu_test.hierarchy_parent_child2
-  parent: menu_test.hierarchy_parent_child
+  parent: menu_test.hierarchy_parent.child
 # Path containing "exotic" characters.
 menu_test.exotic_path:
   title: '"Exotic" path'