diff --git a/message/tests/behat/manage_contacts.feature b/message/tests/behat/manage_contacts.feature
index 5d70f054e7b..535981bd577 100644
--- a/message/tests/behat/manage_contacts.feature
+++ b/message/tests/behat/manage_contacts.feature
@@ -12,7 +12,8 @@ Feature: Manage contacts
     And I log in as "user1"
     And I send "Message 1 from user1 to user2" message to "user2"
     And I send "Message 2 from user1 to user2" message to "user2"
-    And I follow "Messages"
+    And I expand "My profile" node
+    And I click on "Messages" "link" in the "Navigation" "block"
     And I fill in "Search people and messages" with "User Two"
     And I press "Search people and messages"
     When I click on "Add contact" "link" in the "User Two" table row
diff --git a/message/tests/behat/search_history.feature b/message/tests/behat/search_history.feature
index a9334a0b3e2..3092c0f6e94 100644
--- a/message/tests/behat/search_history.feature
+++ b/message/tests/behat/search_history.feature
@@ -11,7 +11,8 @@ Feature: Users can search their message history
       | user2 | User | Two | two@asd.com |
     And I log in as "user1"
     When I send "Give me your biscuits" message to "user2"
-    And I follow "Messages"
+    And I expand "My profile" node
+    And I click on "Messages" "link" in the "Navigation" "block"
     And I fill in "Search people and messages" with "your biscuits"
     And I press "Search people and messages"
     Then I should see "User Two"