diff --git a/automation/test.sh b/automation/test.sh
index 167964506847..ae7675c8623a 100755
--- a/automation/test.sh
+++ b/automation/test.sh
@@ -180,6 +180,7 @@ build --remote_http_cache=http://bazel-cache.kubevirt-prow.svc.cluster.local:808
 EOF
 
 make cluster-sync
+hack/dockerized bazel shutdown
 
 # OpenShift is running important containers under default namespace
 namespaces=(kubevirt default)
diff --git a/hack/bazel-server.sh b/hack/bazel-server.sh
index f8ce68dd45fb..e70e17d19cad 100755
--- a/hack/bazel-server.sh
+++ b/hack/bazel-server.sh
@@ -1,2 +1,5 @@
 BAZEL_PID=$(bazel info | grep server_pid | cut -d " " -f 2)
 while kill -0 $BAZEL_PID 2>/dev/null; do sleep 1; done
+# Might not be necessary, just to be sure that exec shutdowns always succeed
+# and are not killed by docker.
+sleep 1