diff --git a/grade/report/user/tests/behat/user_report_navigation.feature b/grade/report/user/tests/behat/user_report_navigation.feature
index 7de6c819b21..00dd1212eb9 100644
--- a/grade/report/user/tests/behat/user_report_navigation.feature
+++ b/grade/report/user/tests/behat/user_report_navigation.feature
@@ -27,36 +27,36 @@ Feature: Teacher can navigate to the previous or next user report.
 
   Scenario: A teacher can navigate to the next user report
     Given I click on "Student 1" in the "user" search widget
-    And I should see "Student 1" in the ".user-heading" "css_element"
+    And "Student 1" "heading" should exist
     And ".previous" "css_element" should not exist in the ".user-navigation" "css_element"
     And ".next" "css_element" should exist in the ".user-navigation" "css_element"
     And I should see "Student 2" in the ".next" "css_element"
     When I click on "Student 2" "link" in the ".next" "css_element"
-    Then I should see "Student 2" in the ".user-heading" "css_element"
+    And "Student 2" "heading" should exist
     And ".previous" "css_element" should exist in the ".user-navigation" "css_element"
     And I should see "Student 1" in the ".previous" "css_element"
     And ".next" "css_element" should exist in the ".user-navigation" "css_element"
     And I should see "Student 3" in the ".next" "css_element"
     And I click on "Student 3" "link" in the ".next" "css_element"
-    And I should see "Student 3" in the ".user-heading" "css_element"
+    And "Student 3" "heading" should exist
     And ".previous" "css_element" should exist in the ".user-navigation" "css_element"
     And I should see "Student 2" in the ".previous" "css_element"
     And ".next" "css_element" should not exist in the ".user-navigation" "css_element"
 
   Scenario: A teacher can navigate to the previous user report
     Given I click on "Student 3" in the "user" search widget
-    And I should see "Student 3" in the ".user-heading" "css_element"
+    And "Student 3" "heading" should exist
     And ".previous" "css_element" should exist in the ".user-navigation" "css_element"
     And I should see "Student 2" in the ".previous" "css_element"
     And ".next" "css_element" should not exist in the ".user-navigation" "css_element"
     When I click on "Student 2" "link" in the ".previous" "css_element"
-    Then I should see "Student 2" in the ".user-heading" "css_element"
+    And "Student 2" "heading" should exist
     And ".previous" "css_element" should exist in the ".user-navigation" "css_element"
     And I should see "Student 1" in the ".previous" "css_element"
     And ".next" "css_element" should exist in the ".user-navigation" "css_element"
     And I should see "Student 3" in the ".next" "css_element"
     And I click on "Student 1" "link" in the ".previous" "css_element"
-    And I should see "Student 1" in the ".user-heading" "css_element"
+    And "Student 1" "heading" should exist
     And ".previous" "css_element" should not exist in the ".user-navigation" "css_element"
     And ".next" "css_element" should exist in the ".user-navigation" "css_element"
     And I should see "Student 2" in the ".next" "css_element"
diff --git a/grade/tests/behat/grade_regrade_do_not_override.feature b/grade/tests/behat/grade_regrade_do_not_override.feature
index a6f69fec048..15eb6bad162 100644
--- a/grade/tests/behat/grade_regrade_do_not_override.feature
+++ b/grade/tests/behat/grade_regrade_do_not_override.feature
@@ -63,6 +63,7 @@ Feature: Regrading grades does not unnecessarily mark some as overriden
     And I set the field "Grade out of 100" to "70"
     And I press "Save changes"
     When I am on the "Course 1" "grades > Grader report > View" page
+    And I turn editing mode off
     Then the following should exist in the "gradereport-grader-table" table:
       |                      |              |              |
       | First name / Last name | Assignment 1 | Course total |