diff --git a/envoy/tests/conftest.py b/envoy/tests/conftest.py
index 3f6688c1b189b..f74c4a32de930 100644
--- a/envoy/tests/conftest.py
+++ b/envoy/tests/conftest.py
@@ -31,7 +31,9 @@ def dd_environment():
         build=True,
         endpoints="{}/stats".format(URL),
         log_patterns=['front-envoy(.*?)all dependencies initialized. starting workers'],
+        sleep=10,
         attempts=5,
+        attempts_wait=10,
     ):
         # Exercising envoy a bit will trigger extra metrics
         requests.get('http://{}:8000/service/1'.format(HOST))
diff --git a/sap_hana/tests/conftest.py b/sap_hana/tests/conftest.py
index fb2a205656ed3..900f28e33e6a2 100644
--- a/sap_hana/tests/conftest.py
+++ b/sap_hana/tests/conftest.py
@@ -116,6 +116,8 @@ def dd_environment(schema="SYS_DATABASES"):
         env_vars={'PASSWORD': ADMIN_CONFIG['password']},
         mount_logs=True,
         sleep=10,
+        attempts=5,
+        attempts_wait=10,
     ):
         yield CONFIG, E2E_METADATA