diff --git a/test/setup-kubernetes.sh b/test/setup-kubernetes.sh
index d8f491ce2..b7bc18cb6 100755
--- a/test/setup-kubernetes.sh
+++ b/test/setup-kubernetes.sh
@@ -252,6 +252,7 @@ sudo kubeadm init $kubeadm_args $kubeadm_args_init || (
     # Dump some information that might explain the failure.
     sudo systemctl status docker crio containerd kubelet
     sudo journalctl -xe -u docker -u crio -u containerd -u kubelet
+    echo "ERROR: kubeadm init failed, see above."
     exit 1
 )
 mkdir -p $HOME/.kube
diff --git a/test/start-kubernetes.sh b/test/start-kubernetes.sh
index 615abc174..6c88624c4 100755
--- a/test/start-kubernetes.sh
+++ b/test/start-kubernetes.sh
@@ -523,6 +523,12 @@ function cleanup() (
             echo "Docker log for $name:"
             docker logs $name | sed -e "s/^/$name: /"
         fi
+
+        if [ -t 0 ]; then
+            echo "Press RETURN to clean up."
+            read input
+        fi
+
         for vm in $(govm list -f '{{select (filterRegexp . "Name" "^'$(node_filter ${NODES[@]})'$") "Name"}}'); do
             govm remove "$vm"
         done