diff --git a/filebeat/tests/system/test_ml.py b/filebeat/tests/system/test_ml.py
index ec50b21aa5c..80786090e7c 100644
--- a/filebeat/tests/system/test_ml.py
+++ b/filebeat/tests/system/test_ml.py
@@ -133,6 +133,6 @@ def _run_ml_test(self, setup_flag, modules_flag):
         for obj in ["Datafeed", "Job", "Dashboard", "Search", "Visualization"]:
             self.wait_log_contains("{obj} already exists".format(obj=obj),
                                    logfile=output_path,
-                                   max_timeout=30)
+                                   max_timeout=60)
 
         beat.kill()
diff --git a/x-pack/libbeat/docker-compose.yml b/x-pack/libbeat/docker-compose.yml
index 5756ac761fb..6da7cf10218 100644
--- a/x-pack/libbeat/docker-compose.yml
+++ b/x-pack/libbeat/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       kibana: { condition: service_healthy }
     healthcheck:
       interval: 1s
-      retries: 1200
+      retries: 2400
 
   elasticsearch:
     extends:
@@ -30,7 +30,7 @@ services:
       service: elasticsearch
     healthcheck:
       test: ["CMD", "curl", "-u", "elastic:changeme", "-f", "http://localhost:9200"]
-      retries: 600
+      retries: 1200
       interval: 1s
     environment:
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
@@ -47,6 +47,6 @@ services:
       service: kibana
     healthcheck:
       test: ["CMD-SHELL", 'python -c ''import urllib, json; response = urllib.urlopen("http://elastic:changeme@localhost:5601/api/status"); data = json.loads(response.read()); exit(1) if data["status"]["overall"]["state"] != "green" else exit(0);''']
-      retries: 600
+      retries: 1200
       interval: 1s
     command: /usr/local/bin/kibana-docker --xpack.security.enabled=true --elasticsearch.username=elastic --elasticsearch.password=changeme