diff --git a/message/tests/behat/block_users.feature b/message/tests/behat/block_users.feature
index 85bc317afa839..dac1cc679be40 100644
--- a/message/tests/behat/block_users.feature
+++ b/message/tests/behat/block_users.feature
@@ -11,8 +11,7 @@ Feature: Block users from contacting me
       | user1 | User | One | one@asd.com |
       | user2 | User | Two | two@asd.com |
     And I log in as "user1"
-    And I expand "My profile" node
-    And I follow "Messages"
+    And I navigate to "Messages" node in "My profile"
     And I set the field "Search people and messages" to "User Two"
     And I press "Search people and messages"
     When I click on "Block contact" "link" in the "User Two" "table_row"
@@ -21,8 +20,7 @@ Feature: Block users from contacting me
     And I should see "User Two"
     And I log out
     And I log in as "user2"
-    And I expand "My profile" node
-    And I follow "Messages"
+    And I navigate to "Messages" node in "My profile"
     And I set the field "Search people and messages" to "User One"
     And I press "Search people and messages"
     And I follow "Send message to User One"
diff --git a/message/tests/behat/display_history.feature b/message/tests/behat/display_history.feature
index bf97b3008487d..87b60120f18ec 100644
--- a/message/tests/behat/display_history.feature
+++ b/message/tests/behat/display_history.feature
@@ -22,8 +22,7 @@ Feature: Message history displays correctly
     And I send "Message 10 from user1 to user2" message to "User Two" user
 
   Scenario: View sent messages
-    When I expand "My profile" node
-    And I click on "Messages" "link" in the "Navigation" "block"
+    When I navigate to "Messages" node in "My profile"
     And I set the field "Search people and messages" to "User Two"
     And I press "Search people and messages"
     And I click on "Message history" "link" in the "User Two" "table_row"
@@ -38,8 +37,7 @@ Feature: Message history displays correctly
   Scenario: View received messages
     When I log out
     And I log in as "user2"
-    And I expand "My profile" node
-    And I click on "Messages" "link" in the "Navigation" "block"
+    And I navigate to "Messages" node in "My profile"
     And I follow "User One (10)"
     # Should show all of the user's unread messages.
     Then I should see "Message 1 from user1 to user2"
diff --git a/message/tests/behat/manage_contacts.feature b/message/tests/behat/manage_contacts.feature
index 9bb073f84f75d..de51944645b0b 100644
--- a/message/tests/behat/manage_contacts.feature
+++ b/message/tests/behat/manage_contacts.feature
@@ -12,8 +12,7 @@ Feature: Manage contacts
     And I log in as "user1"
     And I send "Message 1 from user1 to user2" message to "User Two" user
     And I send "Message 2 from user1 to user2" message to "User Two" user
-    And I expand "My profile" node
-    And I click on "Messages" "link" in the "Navigation" "block"
+    And I navigate to "Messages" node in "My profile"
     And I set the field "Search people and messages" to "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/message_participants.feature b/message/tests/behat/message_participants.feature
index 3de5662ecc12a..4c151c6945adb 100644
--- a/message/tests/behat/message_participants.feature
+++ b/message/tests/behat/message_participants.feature
@@ -30,8 +30,7 @@ Feature: An user can message course participants
     And I press "Preview"
     And I press "Send message"
     And I follow "Home"
-    And I expand "My profile" node
-    And I follow "Messages"
+    And I navigate to "Messages" node in "My profile"
     And I set the field "Message navigation:" to "Recent conversations"
     Then I should see "Here it is, the message content"
     And I should see "Student 1"
diff --git a/message/tests/behat/search_history.feature b/message/tests/behat/search_history.feature
index d0c72b6352f12..66d74cc5fd768 100644
--- a/message/tests/behat/search_history.feature
+++ b/message/tests/behat/search_history.feature
@@ -11,8 +11,7 @@ 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 "User Two" user
-    And I expand "My profile" node
-    And I click on "Messages" "link" in the "Navigation" "block"
+    And I navigate to "Messages" node in "My profile"
     And I set the field "Search people and messages" to "your biscuits"
     And I press "Search people and messages"
     Then I should see "User Two"