diff --git a/captain_run.sh b/captain_run.sh
index 2b07f66a713da1e3857453607d9bdfacbc9fa7fd..a68901c8403588a8c321192f8f0fbe43bd8dc2da 100755
--- a/captain_run.sh
+++ b/captain_run.sh
@@ -16,7 +16,7 @@ fi
 
 docker run --name portal-db -p 5432:5432 -e POSTGRES_USER=postgres -d postgres
 
-echo 'Wating for DB to start...'
+echo 'Waiting for DB to start...'
 until [ $(docker exec portal-db psql -U postgres -c "\q" 2>&1 | wc -l) -eq 0 ]; do
     printf '.'
     sleep 1
@@ -28,7 +28,7 @@ docker run --name portal-backend -p 8080:8080 \
 -e "FRONTEND_REDIRECT_URL=http://localhost/home" \
 -d hbpmip/portal-backend
 
-echo 'Wating for backend to start...'
+echo 'Waiting for backend to start...'
 until [ $(docker logs portal-backend | grep "Started MIPApplication" | wc -l) -eq 1 ]; do
     printf '.'
     sleep 1
diff --git a/captain_test.sh b/captain_test.sh
index 5a2f2ecb9e8f43d06a5ef7a752be66bc0dec01a6..4097b32beaf621619218230ae5d30bea4117faa9 100755
--- a/captain_test.sh
+++ b/captain_test.sh
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
+export WORKSPACE=$(pwd)
 captain test
\ No newline at end of file
diff --git a/tests/pre-test-run.sh b/tests/pre-test-run.sh
index 554e6c1e7d0cc1ceaf972187988c30d55532fec3..2ca3370c9560feff9ba69aca516d88f000fc59a8 100755
--- a/tests/pre-test-run.sh
+++ b/tests/pre-test-run.sh
@@ -16,17 +16,20 @@ fi
 
 docker run --name portal-db-test -p 5432:5432 -e POSTGRES_USER=postgres -d postgres
 
-echo 'Wating for DB to start...'
+echo 'Waiting 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
 
+GATEWAY_IP=$(docker inspect portal-db-test | grep \"Gateway\":\ \" | sed 's/.*Gateway\":\ \"\([^-]*\)\",/\1/' | head -n 1)
+
 docker run --name portal-backend-test -p 8080:8080 \
 -e "AUTHENTICATION=0" \
+-e "DB_URL=jdbc:postgresql://$GATEWAY_IP:5432/postgres" \
 -d hbpmip/portal-backend
 
-echo 'Wating for backend to start...'
+echo 'Waiting for backend to start...'
 until [ $(docker logs portal-backend-test | grep "Started MIPApplication" | wc -l) -eq 1 ]; do
     printf '.'
     sleep 1