diff --git a/message/tests/behat/send_message.feature b/message/tests/behat/send_message.feature
index 9c3f2e3b5f4..996b6f7eae5 100644
--- a/message/tests/behat/send_message.feature
+++ b/message/tests/behat/send_message.feature
@@ -24,7 +24,7 @@ Feature: Users can send messages to each other
     When I follow "Send a message"
     And I set the field "Message to send" to "Lorem ipsum sa messagus textus"
     And I press "Send message"
-    And I press "Close"
+    And I am on homepage
     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"
@@ -47,7 +47,7 @@ Feature: Users can send messages to each other
     When I follow "Send a message"
     And I set the field "Message to send" to "Lorem ipsum sa messagus textus"
     And I press "Send message"
-    And I press "Close"
+    And I am on homepage
     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"