diff --git a/blog/tests/behat/comment.feature b/blog/tests/behat/comment.feature
index d6c0a0515532f..d5ae9cee0f548 100644
--- a/blog/tests/behat/comment.feature
+++ b/blog/tests/behat/comment.feature
@@ -10,9 +10,8 @@ Feature: Comment on a blog entry
       | testuser | Test | User | moodle@moodlemoodle.com |
       | testuser2 | Test2 | User2 | moodle2@moodlemoodle.com |
     And I log in as "testuser"
-    And I am on homepage
-    And I expand "My profile" node
-    And I expand "Blogs" node
+    And I expand "Site pages" node
+    And I follow "Site blogs"
     And I follow "Add a new entry"
     And I set the following fields to these values:
       | Entry title | Blog post from user 1 |
@@ -22,12 +21,10 @@ Feature: Comment on a blog entry
 
   @javascript
   Scenario: Commenting on my own blog entry
-    Given I am on homepage
+    Given I am on site homepage
     And I log in as "testuser"
-    And I am on homepage
-    And I expand "My profile" node
-    And I expand "Blogs" node
-    And I follow "View all of my entries"
+    And I expand "Site pages" node
+    And I follow "Site blogs"
     And I follow "Blog post from user 1"
     And I should see "User 1 blog post content"
     And I follow "Comments (0)"
@@ -40,12 +37,10 @@ Feature: Comment on a blog entry
 
   @javascript
   Scenario: Deleting my own comment
-    Given I am on homepage
+    Given I am on site homepage
     And I log in as "testuser"
-    And I am on homepage
-    And I expand "My profile" node
-    And I expand "Blogs" node
-    And I follow "View all of my entries"
+    And I expand "Site pages" node
+    And I follow "Site blogs"
     And I follow "Blog post from user 1"
     And I should see "User 1 blog post content"
     And I follow "Comments (0)"
@@ -62,9 +57,9 @@ Feature: Comment on a blog entry
 
   @javascript
   Scenario: Commenting on someone's blog post
-    Given I am on homepage
+    Given I am on site homepage
     And I log in as "testuser2"
-    And I am on homepage
+    And I am on site homepage
     And I expand "Site pages" node
     And I follow "Site blogs"
     And I follow "Blog post from user 1"
diff --git a/calendar/tests/behat/calendar.feature b/calendar/tests/behat/calendar.feature
index de0e752580bc8..aae6ffa3ac0c8 100644
--- a/calendar/tests/behat/calendar.feature
+++ b/calendar/tests/behat/calendar.feature
@@ -24,6 +24,7 @@ Feature: Perform basic calendar functionality
       | user | group |
       | student1 | G1 |
     When I log in as "admin"
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
     And I add the "Calendar" block
@@ -35,6 +36,7 @@ Feature: Perform basic calendar functionality
       | Description | Come join this awesome event, sucka! |
     And I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
     And I follow "This month"
     And I should see "Really awesome event!"
@@ -50,6 +52,7 @@ Feature: Perform basic calendar functionality
       | Description | Come join this awesome event, sucka! |
     And I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
     And I follow "This month"
     And I should see "Really awesome event!"
@@ -66,6 +69,7 @@ Feature: Perform basic calendar functionality
       | Description | Come join this awesome event |
     And I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
     And I follow "This month"
     And I follow "Really awesome event!"
@@ -82,6 +86,7 @@ Feature: Perform basic calendar functionality
       | Description | Come join this awesome event, sucka! |
     And I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
     And I follow "This month"
     And I should not see "Really awesome event!"