diff --git a/admin/tests/behat/display_short_names.feature b/admin/tests/behat/display_short_names.feature
index 9bf758535ed..864b73379c5 100644
--- a/admin/tests/behat/display_short_names.feature
+++ b/admin/tests/behat/display_short_names.feature
@@ -9,6 +9,7 @@ Feature: Display extended course names
       | fullname | shortname | category |
       | Course fullname | C_shortname | 0 |
     And I log in as "admin"
+    And I am on site homepage
 
   Scenario: Courses list without extended course names (default value)
     Then I should see "Course fullname"
@@ -19,5 +20,5 @@ Feature: Display extended course names
     And I click on "Courses" "link" in the "//div[@id='settingsnav']/descendant::li[contains(concat(' ', normalize-space(@class), ' '), ' type_setting ')][contains(., 'Appearance')]" "xpath_element"
     And I set the field "Display extended course names" to "1"
     When I press "Save changes"
-    And I am on homepage
+    And I am on site homepage
     Then I should see "C_shortname Course fullname"
diff --git a/admin/tests/behat/set_admin_settings_value.feature b/admin/tests/behat/set_admin_settings_value.feature
index 66ab175788d..ffe69cb0fdb 100644
--- a/admin/tests/behat/set_admin_settings_value.feature
+++ b/admin/tests/behat/set_admin_settings_value.feature
@@ -9,17 +9,18 @@ Feature: Set admin settings value
       | fullname | shortname | category |
       | Course fullname | C_shortname | 0 |
     And I log in as "admin"
+    And I am on site homepage
     And I should see "Course fullname"
     And I should not see "C_shortname Course fullname"
 
   Scenario: set admin value with full name
     Given the following config values are set as admin:
       | courselistshortnames | 1 |
-    And I am on homepage
+    And I am on site homepage
     Then I should see "C_shortname Course fullname"
 
   Scenario: set admin value with short name
     Given the following config values are set as admin:
       | courselistshortnames | 1 |
-    And I am on homepage
-    Then I should see "C_shortname Course fullname"
\ No newline at end of file
+    And I am on site homepage
+    Then I should see "C_shortname Course fullname"
diff --git a/admin/tests/behat/upload_users.feature b/admin/tests/behat/upload_users.feature
index 7194144fffe..5b8b39d3076 100644
--- a/admin/tests/behat/upload_users.feature
+++ b/admin/tests/behat/upload_users.feature
@@ -33,7 +33,7 @@ Feature: Upload users
     And I should see "Tom Jones"
     And I should see "Trent Reznor"
     And I should see "reznor@someplace.edu"
-    And I am on homepage
+    And I am on site homepage
     And I follow "Maths"
     And I expand "Users" node
     And I follow "Groups"