diff --git a/.travis.yml b/.travis.yml
index 8b83db2a..403707c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,8 +27,5 @@ jobs:
       install:
         - docker-compose build
       script:
-        - docker-compose up
-        - sleep 15 # Wait for cluster to become ready, TODO: do not sleep
-        - HEADERS="$(curl -I -s http://localhost:3000/)"
-        - STATUS="$(echo $HEADERS | head -n1)"
-        - if [[ "$STATUS" != *"200 OK"* ]]; then echo "$HEADERS"; exit 1; fi
+        - docker-compose up -d
+        - while curl -Isf http://localhost:3000; do sleep 1; done