diff --git a/test/840_weave_kube_3_test.sh b/test/840_weave_kube_3_test.sh
index 7823f92956..063396c0e0 100755
--- a/test/840_weave_kube_3_test.sh
+++ b/test/840_weave_kube_3_test.sh
@@ -12,17 +12,24 @@ tear_down_kubeadm() {
     done
 }
 
+howmany() { echo $#; }
+
 start_suite "Test weave-kube image with Kubernetes"
 
 TOKEN=112233.445566778899000
 HOST1IP=$($SSH $HOST1 "getent hosts $HOST1 | cut -f 1 -d ' '")
-SUCCESS="6 established"
+NUM_HOSTS=$(howmany $HOSTS)
+SUCCESS="$(( $NUM_HOSTS * ($NUM_HOSTS-1) )) established"
 
 tear_down_kubeadm
 
-run_on $HOST1 "sudo systemctl start kubelet && sudo kubeadm init --token=$TOKEN"
-run_on $HOST2 "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN $HOST1IP"
-run_on $HOST3 "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN $HOST1IP"
+for host in $HOSTS; do
+    if [ $host = $HOST1 ] ; then
+	run_on $host "sudo systemctl start kubelet && sudo kubeadm init --token=$TOKEN"
+    else
+	run_on $host "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN $HOST1IP"
+    fi
+done
 
 [ -n "$COVERAGE" ] && COVERAGE_ARGS="\\n          env:\\n            - name: EXTRA_ARGS\\n              value: \"-test.coverprofile=/home/weave/cover.prof --\""