diff --git a/prog/weave-kube/launch.sh b/prog/weave-kube/launch.sh
index 76158569..7c82e8ef 100755
--- a/prog/weave-kube/launch.sh
+++ b/prog/weave-kube/launch.sh
@@ -117,7 +117,7 @@ if [ -z "$IPALLOC_INIT" ]; then
     IPALLOC_INIT="consensus=$(peer_count $KUBE_PEERS)"
 fi
 
-/home/weave/weaver --port=6783 $BRIDGE_OPTIONS \
+/home/weave/weaver $EXTRA_ARGS --port=6783 $BRIDGE_OPTIONS \
      --http-addr=$HTTP_ADDR --status-addr=$STATUS_ADDR --docker-api='' --no-dns \
      --ipalloc-range=$IPALLOC_RANGE $NICKNAME_ARG \
      --ipalloc-init $IPALLOC_INIT \
diff --git a/test/840_weave_kube_3_test.sh b/test/840_weave_kube_3_test.sh
new file mode 100755
index 00000000..14c31d95
--- /dev/null
+++ b/test/840_weave_kube_3_test.sh
@@ -0,0 +1,66 @@
+#! /bin/bash
+
+. ./config.sh
+
+tear_down_kubeadm() {
+    for host in $HOSTS; do
+        # If we don't stop kubelet, it will restart all the containers we're trying to kill
+        run_on $host "sudo systemctl stop kubelet"
+        rm_containers $host $(docker_on $host ps -aq)
+        run_on $host "test ! -d /var/lib/kubelet || sudo find /var/lib/kubelet -execdir findmnt -n -t tmpfs -o TARGET -T {} \; | uniq | xargs -r sudo umount"
+        run_on $host "sudo rm -r -f /etc/kubernetes /var/lib/kubelet /var/lib/etcd"
+    done
+}
+
+start_suite "Test weave-kube image with Kubernetes"
+
+TOKEN=112233.445566778899000
+HOST1IP=$($SSH $HOST1 "getent hosts $HOST1 | cut -f 1 -d ' '")
+SUCCESS="6 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"
+
+[ -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 -"
+
+sleep 5
+
+wait_for_connections() {
+    for i in $(seq 1 30); do
+        if run_on $HOST1 "curl -sS http://127.0.0.1:6784/status | grep \"$SUCCESS\"" ; then
+            return
+        fi
+        echo "Waiting for connections"
+        sleep 1
+    done
+    echo "Timed out waiting for connections to establish" >&2
+    exit 1
+}
+
+assert_raises wait_for_connections
+
+# See if we can get some pods running that connect to the network
+run_on $HOST1 "kubectl run hello --image=weaveworks/hello-world --replicas=3"
+
+wait_for_pods() {
+    for i in $(seq 1 30); do
+        if run_on $HOST1 "kubectl get pods | grep 'hello.*Running'" ; then
+            return
+        fi
+        echo "Waiting for pods"
+        sleep 1
+    done
+    echo "Timed out waiting for pods" >&2
+    exit 1
+}
+
+assert_raises wait_for_pods
+
+tear_down_kubeadm
+
+end_suite
diff --git a/test/gce.sh b/test/gce.sh
index 22ebc9de..f2721d42 100755
--- a/test/gce.sh
+++ b/test/gce.sh
@@ -12,7 +12,7 @@ set -e
 : ${PROJECT:=positive-cocoa-90213}
 : ${IMAGE_FAMILY:=ubuntu-1604-lts}
 : ${IMAGE_PROJECT:=ubuntu-os-cloud}
-: ${TEMPLATE_NAME:=test-template-11}
+: ${TEMPLATE_NAME:=test-template-12}
 : ${ZONE:=us-central1-a}
 : ${NUM_HOSTS:=5}
 SUFFIX=""
@@ -90,6 +90,26 @@ systemctl restart docker
 docker run --rm -v /usr/local/bin:/target jpetazzo/nsenter
 docker pull alpine
 docker pull aanand/docker-dnsutils
+docker pull weaveworks/hello-world
+EOF
+}
+
+function install_kubernetes_on {
+	name=$1
+	ssh -t $name sudo bash -x -s <<EOF
+curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
+echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list
+apt-get update -qq
+apt-get install -q -y kubelet kubeadm kubectl kubernetes-cni
+systemctl --now disable kubelet
+# Pre-pull images required for Kubernetes
+docker pull gcr.io/google_containers/etcd-amd64:2.2.5
+docker pull gcr.io/google_containers/kube-apiserver-amd64:v1.4.0
+docker pull gcr.io/google_containers/kube-controller-manager-amd64:v1.4.0
+docker pull gcr.io/google_containers/kube-proxy-amd64:v1.4.0
+docker pull gcr.io/google_containers/kube-scheduler-amd64:v1.4.0
+docker pull gcr.io/google_containers/kube-discovery-amd64:1.0
+docker pull gcr.io/google_containers/pause-amd64:3.0
 EOF
 }
 
@@ -138,6 +158,7 @@ function make_template {
 	name="$TEMPLATE_NAME.$ZONE.$PROJECT"
 	try_connect $name
 	install_docker_on $name
+	install_kubernetes_on $name
 	gcloud -q compute instances delete $TEMPLATE_NAME --keep-disks boot --zone $ZONE
 	gcloud compute images create $TEMPLATE_NAME --source-disk $TEMPLATE_NAME --source-disk-zone $ZONE
 }