diff --git a/mod/quiz/tests/behat/editing_section_headings.feature b/mod/quiz/tests/behat/editing_section_headings.feature
index f16acc8a7d8..fb12326f93e 100644
--- a/mod/quiz/tests/behat/editing_section_headings.feature
+++ b/mod/quiz/tests/behat/editing_section_headings.feature
@@ -149,7 +149,7 @@ Feature: Edit quiz page - section headings
     And I follow "Remove heading 'Heading 2'"
     And I should see "Are you sure you want to remove the 'Heading 2' section heading?"
     And I click on "Yes" "button" in the "Confirm" "dialogue"
-    And I wait until the page is ready
+    And I wait until "Heading 2" "text" does not exist
     Then I should see "Heading 1"
     And I should not see "Heading 2"
     And I should see "Heading 3"
diff --git a/mod/scorm/tests/behat/completion_condition_require_status.feature b/mod/scorm/tests/behat/completion_condition_require_status.feature
index 9fa44374b2d..e6ef3ee2a06 100644
--- a/mod/scorm/tests/behat/completion_condition_require_status.feature
+++ b/mod/scorm/tests/behat/completion_condition_require_status.feature
@@ -47,6 +47,7 @@ Feature: Scorm multi-sco completion
     And I follow "Exit activity"
     And I wait until the page is ready
     Then I should see "Basic Multi-sco SCORM package"
+    And I am on homepage
     And I log out
     And I log in as "teacher1"
     And I follow "Course 1"
@@ -184,6 +185,7 @@ Feature: Scorm multi-sco completion
     And I follow "Exit activity"
     And I wait until the page is ready
     Then I should see "ADV Multi-sco SCORM package"
+    And I am on homepage
     And I log out
     And I log in as "teacher1"
     And I follow "Course 1"