diff --git a/tests/acceptance/features/bootstrap/AppSettingsContext.php b/tests/acceptance/features/bootstrap/AppSettingsContext.php
index b2b6744a36..d7ee4a2eb0 100644
--- a/tests/acceptance/features/bootstrap/AppSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/AppSettingsContext.php
@@ -74,7 +74,7 @@ class AppSettingsContext implements Context, ActorAwareInterface {
 	 * @Given I open the settings
 	 */
 	public function iOpenTheSettings() {
-		$this->actor->find(self::appSettingsOpenButton())->click();
+		$this->actor->find(self::appSettingsOpenButton(), 10)->click();
 	}
 
 	/**
@@ -84,11 +84,11 @@ class AppSettingsContext implements Context, ActorAwareInterface {
 		$locator = self::CheckboxInTheSettings($id);
 
 		// If locator is not visible, fallback to label
-		if (!$this->actor->find(self::CheckboxInTheSettings($id))->isVisible()) {
+		if (!$this->actor->find(self::CheckboxInTheSettings($id), 10)->isVisible()) {
 			$locator = self::checkboxLabelInTheSettings($id);
 		}
 
-		$this->actor->find($locator)->click();
+		$this->actor->find($locator, 10)->click();
 	}
 
 	/**
diff --git a/tests/acceptance/features/bootstrap/AppsManagementContext.php b/tests/acceptance/features/bootstrap/AppsManagementContext.php
index 1f3b2dbe28..d86b972c85 100644
--- a/tests/acceptance/features/bootstrap/AppsManagementContext.php
+++ b/tests/acceptance/features/bootstrap/AppsManagementContext.php
@@ -209,7 +209,7 @@ class AppsManagementContext implements Context, ActorAwareInterface {
 	 * @Given /^I see that the "([^"]*)" is disabled$/
 	 */
 	public function iSeeThatTheIsDisabled($bundle) {
-		PHPUnit\Framework\Assert::assertEquals('Enable all', $this->actor->find(self::bundleButton($bundle))->getValue());
+		PHPUnit\Framework\Assert::assertEquals('Enable all', $this->actor->find(self::bundleButton($bundle), 2)->getValue());
 	}
 
 	/**
diff --git a/tests/acceptance/features/bootstrap/UsersSettingsContext.php b/tests/acceptance/features/bootstrap/UsersSettingsContext.php
index 020da46612..cc542bf2fc 100644
--- a/tests/acceptance/features/bootstrap/UsersSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/UsersSettingsContext.php
@@ -176,21 +176,21 @@ class UsersSettingsContext implements Context, ActorAwareInterface {
 	 * @When I click the New user button
 	 */
 	public function iClickTheNewUserButton() {
-		$this->actor->find(self::newUserButton())->click();
+		$this->actor->find(self::newUserButton(), 10)->click();
 	}
 
 	/**
 	 * @When I click the :action action in the :user actions menu
 	 */
 	public function iClickTheAction($action, $user) {
-		$this->actor->find(self::theAction($action, $user))->click();
+		$this->actor->find(self::theAction($action, $user), 10)->click();
 	}
 
 	/**
 	 * @When I open the actions menu for the user :user
 	 */
 	public function iOpenTheActionsMenuOf($user) {
-		$this->actor->find(self::actionsMenuOf($user))->click();
+		$this->actor->find(self::actionsMenuOf($user), 10)->click();
 	}
 
 	/**