diff --git a/user/tests/behat/enrol_cohort_list.feature b/user/tests/behat/enrol_cohort_list.feature
index 17acd891676..fe32af431f6 100644
--- a/user/tests/behat/enrol_cohort_list.feature
+++ b/user/tests/behat/enrol_cohort_list.feature
@@ -27,8 +27,7 @@ Feature: Viewing the list of cohorts to enrol in a course
       | moodle/cohort:manage | Prohibit |
       | moodle/cohort:view   | Prohibit |
     And I log out
-    And I log in as "teacher1"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as teacher1
     And I navigate to course participants
     When I press "Enrol users"
     Then I should not see "Select cohorts"
@@ -40,8 +39,7 @@ Feature: Viewing the list of cohorts to enrol in a course
       | name        | Test cohort name        |
       | idnumber    | 1337                    |
       | description | Test cohort description |
-    And I log in as "teacher1"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as teacher1
     And I navigate to course participants
     When I press "Enrol users"
     Then I should see "Select cohorts"
@@ -49,8 +47,7 @@ Feature: Viewing the list of cohorts to enrol in a course
 
   @javascript
   Scenario: Check we do not show the cohorts field if there are none present
-    Given I log in as "teacher1"
-    And I am on "Course 1" course homepage
+    Given I am on the "Course 1" course page logged in as teacher1
     And I navigate to course participants
     When I press "Enrol users"
     Then I should not see "Select cohorts"