diff --git a/test/integration/gvisor_addon_test.go b/test/integration/gvisor_addon_test.go
index 172802ceea..ada8765562 100644
--- a/test/integration/gvisor_addon_test.go
+++ b/test/integration/gvisor_addon_test.go
@@ -49,7 +49,7 @@ func TestGvisorAddon(t *testing.T) {
 		CleanupWithLogs(t, profile, cancel)
 	}()
 
-	startArgs := append([]string{"start", "-p", profile, "--container-runtime=containerd", "--docker-opt", "containerd=/var/run/containerd/containerd.sock", "--wait=false"}, StartArgs()...)
+	startArgs := append([]string{"start", "-p", profile, "--container-runtime=containerd", "--docker-opt", "containerd=/var/run/containerd/containerd.sock"}, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 	if err != nil {
 		t.Fatalf("%s failed: %v", rr.Args, err)
@@ -61,20 +61,11 @@ func TestGvisorAddon(t *testing.T) {
 		t.Logf("%s failed: %v (won't test local image)", rr.Args, err)
 	}
 
-	// NOTE: addons are global, but the addon must assert that the runtime is containerd
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "enable", "gvisor"))
 	if err != nil {
 		t.Fatalf("%s failed: %v", rr.Args, err)
 	}
 
-	// Because addons are persistent across profiles :(
-	defer func() {
-		rr, err := Run(t, exec.Command(Target(), "-p", profile, "addons", "disable", "gvisor"))
-		if err != nil {
-			t.Logf("%s failed: %v", rr.Args, err)
-		}
-	}()
-
 	if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", 4*time.Minute); err != nil {
 		t.Fatalf("waiting for gvisor controller to be up: %v", err)
 	}