diff --git a/course/tests/behat/behat_course.php b/course/tests/behat/behat_course.php
index e0ba5c115a1..344a208c3df 100644
--- a/course/tests/behat/behat_course.php
+++ b/course/tests/behat/behat_course.php
@@ -139,6 +139,7 @@ class behat_course extends behat_base {
 
         return array(
             new Given('I add a "' . $this->escape($activity) . '" to section "' . $this->escape($section) . '"'),
+            new Given('I wait to be redirected'),
             new Given('I set the following fields to these values:', $data),
             new Given('I press "' . get_string('savechangesandreturntocourse') . '"')
         );
diff --git a/lib/editor/atto/plugins/image/tests/behat/image.feature b/lib/editor/atto/plugins/image/tests/behat/image.feature
index e3b1138363b..b88913669ae 100644
--- a/lib/editor/atto/plugins/image/tests/behat/image.feature
+++ b/lib/editor/atto/plugins/image/tests/behat/image.feature
@@ -23,6 +23,7 @@ Feature: Add images to Atto
     And the field "Width" matches value "204"
     And the field "Height" matches value "61"
     And I set the field "Auto size" to "1"
+    And I wait until the page is ready
     And I set the field "Width" to "2040"
     # Trigger blur on the width field.
     And I take focus off "Width" "field"
@@ -32,6 +33,7 @@ Feature: Add images to Atto
     And I take focus off "Height" "field"
     And the field "Width" matches value "204"
     And I set the field "Auto size" to "0"
+    And I wait until the page is ready
     And I set the field "Width" to "123"
     And I set the field "Height" to "456"
     # Trigger blur on the height field.