diff --git a/grade/report/singleview/tests/behat/singleview.feature b/grade/report/singleview/tests/behat/singleview.feature
index e65d15cff0e..754d343fb2d 100644
--- a/grade/report/singleview/tests/behat/singleview.feature
+++ b/grade/report/singleview/tests/behat/singleview.feature
@@ -256,6 +256,7 @@ Feature: We can use Single view
     And I navigate to course participants
     And I click on "Unenrol" "icon" in the "Gronya,Beecham" "table_row"
     And I click on "Unenrol" "button" in the "Unenrol" "dialogue"
+    And I am on "Course 1" course homepage
     When I navigate to "View > Single view" in the course gradebook
     Then I should see "Select a user above to view all their grades" in the "region-main" "region"
     And I should not see "Gronya,Beecham" in the "region-main" "region"
diff --git a/grade/report/user/tests/behat/view_usereport.feature b/grade/report/user/tests/behat/view_usereport.feature
index ca9187d3592..f7e8a2fd7e0 100644
--- a/grade/report/user/tests/behat/view_usereport.feature
+++ b/grade/report/user/tests/behat/view_usereport.feature
@@ -91,7 +91,7 @@ Feature: We can use the user report
     And I navigate to "View > User report" in the course gradebook
     And I click on "Student 1" in the "user" search widget
     And I navigate to "View > Grader report" in the course gradebook
-    And I click on "Group 1" in the "group" search widget
+    And I select "Group 1" from the "group" singleselect
     When I navigate to "View > User report" in the course gradebook
     Then I should see "Select a user above to view their report" in the "region-main" "region"
     And I should not see "Student 1" in the "region-main" "region"