diff --git a/.travis.yml b/.travis.yml
index 132351bde..9777e47a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ script:
   #- docker-compose up -d
   #- docker logs sapl
   #- docker-compose rm -f -s -v
-  - docker-compose -f docker-compose-test.yml run --workdir="/var/interlegis/sapl" sapl bash -c "cp docker/config/env_test .env && py.test --create-db"
+  - docker-compose -f docker-compose-test.yml run --workdir="/var/interlegis/sapl" sapl bash -c "bash busy-wait.sh postgresql://sapl:sapl@sapldb:5432/sapl && cp docker/config/env_test .env && py.test --create-db"
 
 after_script:
   # Cleanup docker containers, images, and volumes
diff --git a/docker/busy-wait.sh b/docker/busy-wait.sh
old mode 100644
new mode 100755
diff --git a/docker/config/env_test b/docker/config/env_test
index 06cc206cb..ccb203867 100644
--- a/docker/config/env_test
+++ b/docker/config/env_test
@@ -1,4 +1,4 @@
-DATABASE_URL=postgresql://postgres:@sapldb:/sapl
+DATABASE_URL=postgresql://sapl:sapl@sapldb:/sapl
 SECRET_KEY=test++@i1y-6y8ez_=^sfbr!dzuyry#^@v(3g^2d1k9%f=+mhlb
 DEBUG=False
 EMAIL_USE_TLS = True