diff --git a/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits.yaml b/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits.yaml
index eb5fe5088f..2756f0d1e7 100644
--- a/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits.yaml
+++ b/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits.yaml
@@ -208,8 +208,10 @@ presubmits:
             wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz -nv -S &&
             tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ &&
             export PATH=/usr/local/go/bin:$PATH &&
-            export TARGET=kind-k8s-sriov-1.17.0 &&
-            automation/test.sh
+            export KUBEVIRT_PROVIDER=kind-k8s-sriov-1.17.0 &&
+            export TARGET=kind-k8s-sriov-1.17.0;
+            trap "make cluster-down" EXIT;
+            automation/test.sh;
         # docker-in-docker needs privileged mode
         securityContext:
           privileged: true
diff --git a/github/ci/prow/files/jobs/kubevirt/kubevirtci/kubevirtci-presubmits.yaml b/github/ci/prow/files/jobs/kubevirt/kubevirtci/kubevirtci-presubmits.yaml
index 443f5311e0..38f2198b2b 100644
--- a/github/ci/prow/files/jobs/kubevirt/kubevirtci/kubevirtci-presubmits.yaml
+++ b/github/ci/prow/files/jobs/kubevirt/kubevirtci/kubevirtci-presubmits.yaml
@@ -82,8 +82,9 @@ presubmits:
             tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ &&
             export PATH=/usr/local/go/bin:$PATH &&
             export KUBEVIRT_PROVIDER=kind-k8s-sriov-1.17.0 &&
-            export KUBEVIRT_NUM_NODES=2 &&
-            make cluster-up
+            export KUBEVIRT_NUM_NODES=2;
+            trap "make cluster-down" EXIT;
+            make cluster-up;
         # docker-in-docker needs privileged mode
         securityContext:
           privileged: true