diff --git a/admin/tests/behat/behat_admin.php b/admin/tests/behat/behat_admin.php
index 3c8acbc82bd..02d6cf6a8ca 100644
--- a/admin/tests/behat/behat_admin.php
+++ b/admin/tests/behat/behat_admin.php
@@ -81,6 +81,8 @@ class behat_admin extends behat_base {
 
             $this->execute('behat_forms::i_set_the_field_with_xpath_to', [$fieldxpath, $value]);
             $this->execute("behat_general::i_click_on", [get_string('savechanges'), 'button']);
+            // Wait for the page to be redirected.
+            $this->execute("behat_general::i_wait_to_be_redirected");
         }
     }
 
diff --git a/theme/classic/tests/behat/behat_theme_classic_behat_admin.php b/theme/classic/tests/behat/behat_theme_classic_behat_admin.php
index c25e65ce8cb..56962e5eba6 100644
--- a/theme/classic/tests/behat/behat_theme_classic_behat_admin.php
+++ b/theme/classic/tests/behat/behat_theme_classic_behat_admin.php
@@ -88,8 +88,9 @@ class behat_theme_classic_behat_admin extends behat_admin {
             }
 
             $this->execute('behat_forms::i_set_the_field_with_xpath_to', [$fieldxpath, $value]);
-
             $this->execute("behat_general::i_click_on", [get_string('savechanges'), 'button']);
+            // Wait for the page to be redirected.
+            $this->execute("behat_general::i_wait_to_be_redirected");
         }
     }
 }