diff --git a/test/config.sh b/test/config.sh
index 10cc3fc7..2ddfe115 100644
--- a/test/config.sh
+++ b/test/config.sh
@@ -196,7 +196,7 @@ assert_dns_ptr_record() {
 }
 
 start_suite() {
-    for host in $HOST1 $HOST2; do
+    for host in $HOSTS; do
         [ -z "$DEBUG" ] || echo "Cleaning up on $host: removing all containers and resetting weave"
         weave_on $host reset 2>/dev/null
         rm_containers $host $(docker_on $host ps -aq 2>/dev/null)
diff --git a/test/sanity_check.sh b/test/sanity_check.sh
index 1ec566bc..592a6b77 100755
--- a/test/sanity_check.sh
+++ b/test/sanity_check.sh
@@ -5,26 +5,22 @@
 set -e
 
 whitely echo Ping each host from the other
-run_on $HOST2 $PING $HOST1
-run_on $HOST1 $PING $HOST2
+for host in $HOSTS; do
+    for other in $HOSTS; do
+        [ $host = $other ] || run_on $host $PING $other
+    done
+done
 
 whitely echo Check we can reach docker
-echo
-echo Host Version Info: $HOST1
-echo =====================================
-echo "# docker version"
-docker_on $HOST1 version
-echo "# docker info"
-docker_on $HOST1 info
-echo "# weave version"
-weave_on $HOST1 version
 
-echo
-echo Host Version Info: $HOST2
-echo =====================================
-echo "# docker version"
-docker_on $HOST2 version
-echo "# docker info"
-docker_on $HOST2 info
-echo "# weave version"
-weave_on $HOST2 version
+for host in $HOSTS; do
+    echo
+    echo Host Version Info: $host
+    echo =====================================
+    echo "# docker version"
+    docker_on $host version
+    echo "# docker info"
+    docker_on $host info
+    echo "# weave version"
+    weave_on $host version
+done