diff --git a/Makefile b/Makefile
index 5b185cb15af9..510660526262 100755
--- a/Makefile
+++ b/Makefile
@@ -190,7 +190,7 @@ test-pkg/%: pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go
 	go test -v -test.timeout=60m ./$* --tags="$(MINIKUBE_BUILD_TAGS)"
 
 .PHONY: all
-all: cross drivers e2e-cross out/gvisor-addon
+all: cross drivers e2e-cross
 
 .PHONY: drivers
 drivers: out/docker-machine-driver-hyperkit out/docker-machine-driver-kvm2
diff --git a/test/integration/containerd_test.go b/test/integration/containerd_test.go
index 064f2670d5fd..822631730eb7 100644
--- a/test/integration/containerd_test.go
+++ b/test/integration/containerd_test.go
@@ -48,7 +48,7 @@ func testGvisorRestart(t *testing.T) {
 	mk := NewMinikubeRunner(t, p, "--wait=false")
 	defer mk.TearDown(t)
 
-	stdout, stderr, err := mk.Start("--container-runtime=containerd", "--docker-opt containerd=/var/run/containerd/containerd.sock", "--vm-driver=kvm2")
+	stdout, stderr, err := mk.Start("--container-runtime=containerd", "--docker-opt containerd=/var/run/containerd/containerd.sock")
 	if err != nil {
 		t.Fatalf("failed to start minikube (for profile %s) failed : %v\nstdout: %s\nstderr: %s", p, err, stdout, stderr)
 	}
@@ -69,7 +69,7 @@ func testGvisorRestart(t *testing.T) {
 	deleteUntrustedWorkload(t, p)
 
 	mk.RunCommand("delete", true)
-	stdout, stderr, err = mk.Start("--container-runtime=containerd", "--docker-opt containerd=/var/run/containerd/containerd.sock", "--vm-driver=kvm2")
+	stdout, stderr, err = mk.Start("--container-runtime=containerd", "--docker-opt containerd=/var/run/containerd/containerd.sock")
 	if err != nil {
 		t.Fatalf("failed to start minikube (for profile %s) failed : %v \nstdout: %s \nstderr: %s", t.Name(), err, stdout, stderr)
 	}