diff --git a/user/tests/behat/user_grade_navigation.feature b/user/tests/behat/user_grade_navigation.feature
index a3f8bf46761..78ca61543d8 100644
--- a/user/tests/behat/user_grade_navigation.feature
+++ b/user/tests/behat/user_grade_navigation.feature
@@ -66,12 +66,6 @@ Feature: The student can navigate to their grades page and user grade report.
     And I am on site homepage
     And I turn editing mode on
     And I add the "Mentees" block
-    # TODO MDL-57216 this functionality should work without navigation block.
-    And I add the "Navigation" block if not present
-    And I configure the "Navigation" block
-    And I set the following fields to these values:
-      | Page contexts | Display throughout the entire site |
-    And I press "Save changes"
     And I navigate to "Define roles" node in "Site administration > Users > Permissions"
     And I click on "Add a new role" "button"
     And I click on "Continue" "button"
@@ -95,7 +89,7 @@ Feature: The student can navigate to their grades page and user grade report.
     And I log in as "parent1"
     And I am on site homepage
     And I follow "Student 1"
-    And I click on "Grades" "link" in the "Navigation" "block"
+    And I follow "Grades overview"
     Then the following should exist in the "overview-grade" table:
     | Course name | Grade |
     | Course 2 | - |