diff --git a/mod/forum/tests/behat/app_basic_usage.feature b/mod/forum/tests/behat/app_basic_usage.feature
index c9c5ad14e..681e6219f 100755
--- a/mod/forum/tests/behat/app_basic_usage.feature
+++ b/mod/forum/tests/behat/app_basic_usage.feature
@@ -240,7 +240,8 @@ Feature: Test basic usage of forum activity in app
     And I press "Display options" near "Reply" in the app
     Then I should not find "Delete" in the app
 
-    When I switch offline mode to "false"
+    When I close the popup in the app
+    And I switch offline mode to "false"
     And I press "Display options" near "Reply" in the app
     And I press "Delete" in the app
     And I press "Delete" in the app
diff --git a/mod/messages/tests/behat/app_basic_usage.feature b/mod/messages/tests/behat/app_basic_usage.feature
index 7af987d3f..dad30af63 100755
--- a/mod/messages/tests/behat/app_basic_usage.feature
+++ b/mod/messages/tests/behat/app_basic_usage.feature
@@ -158,8 +158,7 @@ Feature: Test basic usage of messages in app
     And I press "Display options" in the app
     Then I should find "Add to contacts" in the app
 
-    When I press "Display options" in the app
-    And I press "Delete conversation" in the app
+    When I press "Delete conversation" in the app
     And I press "Delete" near "Are you sure you would like to delete this entire conversation?" in the app
     Then I should not find "heeey student" in the app
     And I should not find "hi" in the app
@@ -392,6 +391,7 @@ Feature: Test basic usage of messages in app
     And I should find "Delete conversation" in the app
 
     When I press "Show delete messages" in the app
+    And I close the popup in the app
     Then I should find "self conversation online" in the app
     And I should find "self conversation offline" in the app
 
diff --git a/mod/messages/tests/behat/navigation.feature b/mod/messages/tests/behat/navigation.feature
index 15bded770..5be92c2ca 100644
--- a/mod/messages/tests/behat/navigation.feature
+++ b/mod/messages/tests/behat/navigation.feature
@@ -37,6 +37,7 @@ Feature: Test messages navigation in the app
     When I press "Display options" in the app
     Then I should not find "User info" in the app
 
-    When I press the back button in the app
+    When I close the popup in the app
+    And I press the back button in the app
     And I press the back button in the app
     Then I should find "Hi there" in the app