diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c6ee807a..4b6e8557 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Starting Gremlin Servers
         run: |
-          docker-compose -f ./docker-compose/docker-compose.yaml up -d 
+          docker-compose -f ./docker-compose/docker-compose.yaml up -d --wait --wait-timeout 30
         env: 
           GREMLIN_SERVER: ${{ matrix.gremlin-server }}
 
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index 781ab2b3..b208dd53 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -26,4 +26,9 @@ services:
       - JANUS_PROPS_TEMPLATE=inmemory
     ports:
       - "8184:8182"
+    healthcheck:
+      test: ["CMD", "bin/gremlin.sh", "-e", "scripts/remote-connect.groovy"]
+      interval: 10s
+      timeout: 30s
+      retries: 3
   
\ No newline at end of file