diff --git a/x-pack/agentbeat/docker-compose.yml b/x-pack/agentbeat/docker-compose.yml
index 5c98c9b459c0..b4dbda4d86f6 100644
--- a/x-pack/agentbeat/docker-compose.yml
+++ b/x-pack/agentbeat/docker-compose.yml
@@ -6,6 +6,7 @@ services:
     image: busybox
     depends_on:
       elasticsearch: { condition: service_healthy }
+      kibana:        { condition: service_healthy }
       cometd: { condition: service_healthy }
 
   elasticsearch:
@@ -24,3 +25,11 @@ services:
     hostname: cometd
     ports:
       - 8080:8080
+
+  kibana:
+    extends:
+      file: ${ES_BEATS}/testing/environments/${STACK_ENVIRONMENT}.yml
+      service: kibana
+    healthcheck:
+      test: [ "CMD-SHELL", "curl -u beats:testing -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'" ]
+      retries: 600