diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
index 760ec182..dc114756 100644
--- a/.github/workflows/test-docker.yml
+++ b/.github/workflows/test-docker.yml
@@ -13,5 +13,5 @@ jobs:
     - name: Build and Test
       run: |
         docker-compose -f docker-compose.yml -f docker-compose.build.yml up --build -d
-        while sleep 5; do docker ps -a; if [[ -n "`docker ps | grep webapp | grep ' Up '`" ]]; then break; fi; done
+        ./wait-for-it.sh localhost:8000 -t 60 -- echo "WebODM is up"
         docker-compose exec webapp /bin/bash -c "/webodm/webodm.sh test"
\ No newline at end of file