diff --git a/lib/form/tests/behat/modgrade_validation.feature b/lib/form/tests/behat/modgrade_validation.feature
index 80336c91298..cc4fe72010c 100644
--- a/lib/form/tests/behat/modgrade_validation.feature
+++ b/lib/form/tests/behat/modgrade_validation.feature
@@ -147,7 +147,7 @@ Feature: Using the activity grade form element
     And I set the field "Grade" to "C"
     And I press "Save changes"
     And I press "Ok"
-    And I click on "Edit settings" "link" in the "Administration" "block"
+    And I follow "Edit settings"
     When I expand all fieldsets
     Then I should see "Some grades have already been awarded, so the grade type and scale cannot be changed"
     # Try saving the form and visiting it back to verify everything is working ok.
@@ -207,6 +207,6 @@ Feature: Using the activity grade form element
     And I set the field "Grade out of 100" to "50"
     And I press "Save changes"
     And I press "Ok"
-    And I click on "Edit settings" "link" in the "Administration" "block"
+    And I follow "Edit settings"
     When I expand all fieldsets
     Then I should see "Some grades have already been awarded, so the grade type cannot be changed. If you wish to change the maximum grade, you must first choose whether or not to rescale existing grades."
diff --git a/mod/choice/tests/behat/modify_choice.feature b/mod/choice/tests/behat/modify_choice.feature
index 22beb92e998..75fc6e89a4d 100644
--- a/mod/choice/tests/behat/modify_choice.feature
+++ b/mod/choice/tests/behat/modify_choice.feature
@@ -84,7 +84,7 @@ Feature: Teacher can modify choices of the students
     And I log in as "teacher1"
     And I follow "Course 1"
     And I follow "Choice name"
-    And I follow "View 1 responses"
+    And I click on "View 1 responses" "link" in the "Administration" "block"
     And I click on "Student 1 Option 2" "checkbox"
     And I select "Delete" from the "With selected" singleselect
     And I click on "Student 1 Option 1" "checkbox"