diff --git a/test/601_proxy_docker_py_test.sh b/test/601_proxy_docker_py_test.sh
index 9829bc17..c923e75c 100755
--- a/test/601_proxy_docker_py_test.sh
+++ b/test/601_proxy_docker_py_test.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
 
-. ./600_proxy_docker_py.sh
+. "$(dirname "$0")/600_proxy_docker_py.sh"
 
 docker_py_test 0 4
diff --git a/test/602_proxy_docker_py_test.sh b/test/602_proxy_docker_py_test.sh
index 742e1484..06b1ba2d 100755
--- a/test/602_proxy_docker_py_test.sh
+++ b/test/602_proxy_docker_py_test.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
 
-. ./600_proxy_docker_py.sh
+. "$(dirname "$0")/600_proxy_docker_py.sh"
 
 docker_py_test 1 4
diff --git a/test/603_proxy_docker_py_test.sh b/test/603_proxy_docker_py_test.sh
index ec8d0718..d83a3a24 100755
--- a/test/603_proxy_docker_py_test.sh
+++ b/test/603_proxy_docker_py_test.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
 
-. ./600_proxy_docker_py.sh
+. "$(dirname "$0")/600_proxy_docker_py.sh"
 
 docker_py_test 2 4
diff --git a/test/604_proxy_docker_py_test.sh b/test/604_proxy_docker_py_test.sh
index db60bba1..d77b250b 100755
--- a/test/604_proxy_docker_py_test.sh
+++ b/test/604_proxy_docker_py_test.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
 
-. ./600_proxy_docker_py.sh
+. "$(dirname "$0")/600_proxy_docker_py.sh"
 
 docker_py_test 3 4
diff --git a/test/670_proxy_tls_test.sh b/test/670_proxy_tls_test.sh
index 6b48030e..470dc8d9 100755
--- a/test/670_proxy_tls_test.sh
+++ b/test/670_proxy_tls_test.sh
@@ -13,6 +13,6 @@ weave_on $HOST1 launch-proxy \
   --tlscert   $PWD/tls/$HOST1.pem \
   --tlskey    $PWD/tls/$HOST1-key.pem
 
-assert_raises "DOCKER_CERT_PATH=./tls proxy docker_on $HOST1 --tlsverify ps"
+assert_raises "DOCKER_CERT_PATH=$(dirname "$0")/tls proxy docker_on $HOST1 --tlsverify ps"
 
 end_suite
diff --git a/test/840_weave_kube_3_test.sh b/test/840_weave_kube_3_test.sh
index 473fca69..5703b8ce 100755
--- a/test/840_weave_kube_3_test.sh
+++ b/test/840_weave_kube_3_test.sh
@@ -26,7 +26,7 @@ run_on $HOST3 "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN
 
 [ -n "$COVERAGE" ] && COVERAGE_ARGS="\\n          env:\\n            - name: EXTRA_ARGS\\n              value: \"-test.coverprofile=/home/weave/cover.prof --\""
 
-sed -e "s%imagePullPolicy: Always%imagePullPolicy: Never$COVERAGE_ARGS%" ../prog/weave-kube/weave-daemonset.yaml | run_on $HOST1 "kubectl apply -f -"
+sed -e "s%imagePullPolicy: Always%imagePullPolicy: Never$COVERAGE_ARGS%" "$(dirname "$0")/../prog/weave-kube/weave-daemonset.yaml" | run_on $HOST1 "kubectl apply -f -"
 
 sleep 5
 
diff --git a/test/run_all.sh b/test/run_all.sh
index 78cc7f74..db04b50f 100755
--- a/test/run_all.sh
+++ b/test/run_all.sh
@@ -10,7 +10,7 @@ if ! bash "$DIR/sanity_check.sh"; then
 fi
 whitely echo ...ok
 
-TESTS="${@:-$(find . -name '*_test.sh')}"
+TESTS="${@:-$(find "$DIR" -name '*_test.sh')}"
 RUNNER_ARGS=""
 
 # If running on circle, use the scheduler to work out what tests to run
diff --git a/test/setup.sh b/test/setup.sh
index 374a6518..f999aff9 100755
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -4,7 +4,7 @@ set -e
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-. "$(dirname "$0")/config.sh"
+. ./config.sh
 
 (cd ./tls && ./tls $HOSTS)