diff --git a/Dockerfile b/Dockerfile
index dd10fd94b..a7bf01657 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.5
 
 ENV BUILD_PACKAGES postgresql-dev graphviz-dev graphviz build-base git pkgconfig \
 python3-dev libxml2-dev jpeg-dev libressl-dev libffi-dev libxslt-dev nodejs py3-lxml \
-py3-magic
+py3-magic postgresql-client
 
 RUN apk add --no-cache python3 && \
     python3 -m ensurepip && \
diff --git a/busy-wait.sh b/busy-wait.sh
index 966ed5db7..128592ffc 100644
--- a/busy-wait.sh
+++ b/busy-wait.sh
@@ -1,12 +1,10 @@
 #!/bin/sh
 
-#
-
 while true; do
-    COUNT_PG=`netstat -an | grep "tcp.*:5532.*LISTEN"| wc -l`
+    COUNT_PG=`psql --dbname=postgresql://sapl:sapl@sapldb/sapl -c '\l \q' | grep sapl | wc -l`
     if ! [ "$COUNT_PG" -eq "0" ]; then
        break
     fi
-    echo "Esperando BD"
-    sleep 5
+    echo "Esperando Database Setup"
+    sleep 10
 done
diff --git a/docker-compose.yml b/docker-compose.yml
index 66ad4e4fa..ce5c283fb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ server:
     - web
   links:
     - web
-sapl_db:
+sapldb:
   image: postgres
   environment:
     POSTGRES_PASSWORD: sapl
@@ -25,4 +25,4 @@ web:
   volumes:
     - .:/sapl
   links:
-    - sapl_db
+    - sapldb
diff --git a/sapl/.env_test b/sapl/.env_test
index 5c2c60ec1..9416d402d 100644
--- a/sapl/.env_test
+++ b/sapl/.env_test
@@ -1,4 +1,4 @@
-DATABASE_URL = postgresql://postgres:@localhost:/sapl
+DATABASE_URL = postgresql://postgres:@sapldb:/sapl
 SECRET_KEY=TravisTest
 DEBUG=False
 EMAIL_USE_TLS = True