diff --git a/captain.yml b/captain.yml
index 782b43d80463510be533125044c7e2202dcd2cbe..20d2f6aa6c6d10b6edb34aab0893f13bf980322c 100644
--- a/captain.yml
+++ b/captain.yml
@@ -11,8 +11,6 @@ builder:
     - echo "Building project..."
     - docker run --rm -v $WORKSPACE:/build/ -v $HOME/.m2:/home/build/.m2/ portal-backend-builder:latest
     - echo "Finished building project"
-  test:
-    - ./tests/test-build.sh
 
 portal-backend:
   build: Dockerfile
diff --git a/tests/post-test-run.sh b/tests/post-test-run.sh
index d8c978cbc4e2c8bac62b281903c734aae3740aa4..d462d878d11f713fad23eb69dd4f97762353ca37 100755
--- a/tests/post-test-run.sh
+++ b/tests/post-test-run.sh
@@ -3,13 +3,25 @@
 
 # Kill old containers
 
-docker kill backend-test
-docker kill portal-db-test
-docker kill science-db-test
+if [ $(docker ps | grep backend-test | wc -l) -gt 0 ]; then
+  docker kill backend-test
+fi
+if [ $(docker ps | grep portal-db-test | wc -l) -gt 0 ]; then
+  docker kill portal-db-test
+fi
+if [ $(docker ps | grep science-db-test | wc -l) -gt 0 ]; then
+  docker kill science-db-test
+fi
 
 
 # Remove old containers
 
-docker rm -f backend-test
-docker rm -f portal-db-test
-docker rm -f science-db-test
+if [ $(docker ps -a | grep backend-test | wc -l) -gt 0 ]; then
+  docker rm -f backend-test
+fi
+if [ $(docker ps -a | grep portal-db-test | wc -l) -gt 0 ]; then
+  docker rm -f portal-db-test
+fi
+if [ $(docker ps -a | grep science-db-test | wc -l) -gt 0 ]; then
+  docker rm -f science-db-test
+fi
diff --git a/tests/pre-test-run.sh b/tests/pre-test-run.sh
index f590ae2193af2ca40c047e18f95b82056e72f192..09385707463be0d51bd7ea012bdcbaaf3fd13f83 100755
--- a/tests/pre-test-run.sh
+++ b/tests/pre-test-run.sh
@@ -29,8 +29,8 @@ fi
 
 # Run databases containers
 
-docker run --name science-db-test -p 65432:5432 -v $(pwd)/science-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=science -d postgres:9.5.3
-docker run --name portal-db-test -p 65433:5432 -v $(pwd)/meta-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=portal -d postgres:9.5.3
+docker run --name science-db-test -p 65432:5432 -v $(pwd)/tests/science-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=science -d postgres:9.5.3
+docker run --name portal-db-test -p 65433:5432 -v $(pwd)/tests/meta-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=portal -d postgres:9.5.3
 
 
 # Get gateway IP
diff --git a/tests/test-build.sh b/tests/test-build.sh
deleted file mode 100755
index 81eef036ba49b29a8ae6ce88123f66ba25d2014a..0000000000000000000000000000000000000000
--- a/tests/test-build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-if [ ! -f ./target/portal-backend-1.0.0-docker-packaging.jar ]; then
-    exit 1
-fi
-
-exit 0
diff --git a/tests/test-run.sh b/tests/test-run.sh
index 1c5523b296a713f343e6d7412ed3ae4d4c387790..d52a8469336c805827a339640e13a75e7030a96b 100755
--- a/tests/test-run.sh
+++ b/tests/test-run.sh
@@ -3,7 +3,7 @@
 
 # Get gateway IP
 
-GATEWAY_IP=$(docker inspect portal-db-test | grep \"Gateway\":\ \" | sed 's/.*Gateway\":\ \"\([^-]*\)\",/\1/' | head -n 1)
+GATEWAY_IP=$(docker inspect backend-test | grep \"Gateway\":\ \" | sed 's/.*Gateway\":\ \"\([^-]*\)\",/\1/' | head -n 1)
 
 # if [ "$(curl -s $GATEWAY_IP:8080/services/groups)" != "$groups" ]; then
 #   echo "failed to load groups"