diff --git a/tests/pre-test-run.sh b/tests/pre-test-run.sh
index 404992f94e5388af2f44702ec8896b6f20b06271..554e6c1e7d0cc1ceaf972187988c30d55532fec3 100755
--- a/tests/pre-test-run.sh
+++ b/tests/pre-test-run.sh
@@ -14,10 +14,20 @@ if [ $(docker ps -a | grep portal-backend-test | wc -l) -gt 0 ]; then
   docker rm -f portal-backend-test
 fi
 
-docker run --name portal-db-test -e POSTGRES_USER=postgres -d postgres
-docker run --name portal-backend-test -p 8000:8000 \
--e "DB_URL=jdbc:postgresql://172.22.0.1:5432/postgres" \
--e "DB_USER=postgres" \
--e "CONTEXT_PATH=/services" \
--e "PORT=8080" \
+docker run --name portal-db-test -p 5432:5432 -e POSTGRES_USER=postgres -d postgres
+
+echo 'Wating for DB to start...'
+until [ $(docker exec portal-db-test psql -U postgres -c "\q" 2>&1 | wc -l) -eq 0 ]; do
+    printf '.'
+    sleep 1
+done
+
+docker run --name portal-backend-test -p 8080:8080 \
+-e "AUTHENTICATION=0" \
 -d hbpmip/portal-backend
+
+echo 'Wating for backend to start...'
+until [ $(docker logs portal-backend-test | grep "Started MIPApplication" | wc -l) -eq 1 ]; do
+    printf '.'
+    sleep 1
+done