diff --git a/acceptance_norecorder.suite.yml b/acceptance_norecorder.suite.yml
index 7d9cd649eac7a0b4089c179be1a2b99e1152e7e3..076a7f7b7679d139eda2eeb991f18f5531f65d5a 100644
--- a/acceptance_norecorder.suite.yml
+++ b/acceptance_norecorder.suite.yml
@@ -11,6 +11,8 @@ modules:
         url: http://nginx
         browser: chrome
         port: 9515
+        request_timeout: 30
+        wait: 30
         capabilities:
           acceptInsecureCerts: true
           enableVerboseLogging: false
diff --git a/acceptance_recorder.suite.yml b/acceptance_recorder.suite.yml
index e6c1953245f09644934f476dcb38a1bf3dc1b698..9dd369fa58f21e7754c00b13549fab6ccb592aec 100644
--- a/acceptance_recorder.suite.yml
+++ b/acceptance_recorder.suite.yml
@@ -11,6 +11,8 @@ modules:
         url: http://nginx
         browser: chrome
         port: 9515
+        request_timeout: 30
+        wait: 30
         capabilities:
           acceptInsecureCerts: true
           enableVerboseLogging: false
diff --git a/codeception.yml b/codeception.yml
index 5a96943c280d23df16efc6236a42007d9716d6d4..cf49bf7eb13f44748c773104fbf518067c7db434 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -1,5 +1,6 @@
 settings:
   memory_limit: 2048M
+  shuffle: true
 paths:
     tests: tests
     output: tests/_output