diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
index 957d6f91..3ac5e1d9 100644
--- a/.github/workflows/pipeline.yaml
+++ b/.github/workflows/pipeline.yaml
@@ -91,8 +91,7 @@ jobs:
         run: |
           mkdir -p tests/Conformance/sessions tests/Conformance/logs
           chmod -R 777 tests/Conformance/sessions tests/Conformance/logs
-          docker compose -f tests/Conformance/Fixtures/docker-compose.yml up -d
-          sleep 5
+          docker compose -f tests/Conformance/Fixtures/docker-compose.yml up -d --wait
 
       - name: Run conformance tests
         working-directory: ./tests/Conformance
diff --git a/tests/Conformance/Fixtures/docker-compose.yml b/tests/Conformance/Fixtures/docker-compose.yml
index 62e2e8bd..1fff1564 100644
--- a/tests/Conformance/Fixtures/docker-compose.yml
+++ b/tests/Conformance/Fixtures/docker-compose.yml
@@ -10,6 +10,12 @@ services:
       - php-fpm
     networks:
       - mcp-net
+    healthcheck:
+      test: ["CMD", "wget", "-q", "-O-", "http://127.0.0.1/healthz"]
+      interval: 2s
+      timeout: 2s
+      retries: 10
+      start_period: 2s
 
   php-fpm:
     image: php:8.4-fpm-alpine
diff --git a/tests/Conformance/Fixtures/nginx.conf b/tests/Conformance/Fixtures/nginx.conf
index 9159c461..969925ad 100644
--- a/tests/Conformance/Fixtures/nginx.conf
+++ b/tests/Conformance/Fixtures/nginx.conf
@@ -3,6 +3,11 @@ server {
     server_name localhost;
     root /app;
 
+    location = /healthz {
+        access_log off;
+        return 200 "ok\n";
+    }
+
     location / {
         try_files $uri /tests/Conformance/server.php$is_args$args;
     }