diff --git a/test/integration/containerd_test.go b/test/integration/containerd_test.go
index 36b7571f048d9acc5fbdc269ca000f933b2edbd7..d9660ddaee83a8f9bd17796567c8607854978abd 100644
--- a/test/integration/containerd_test.go
+++ b/test/integration/containerd_test.go
@@ -58,7 +58,7 @@ func testGvisorRestart(t *testing.T) {
 
 	mk.RunCommand("stop", false)
 	mk.CheckStatus(state.Stopped.String())
-	stdout, stderr, err = mk.Start()
+	stdout, stderr, err := mk.Start()
 	if err != nil {
 		t.Fatalf("failed to start minikube (for profile %s) failed : %v \nstdout: %s \nstderr: %s", t.Name(), err, stdout, stderr)
 	}
diff --git a/test/integration/util/minikube_runner.go b/test/integration/util/minikube_runner.go
index c6e5dfd3f7070eca4493fbc03f5ec2ca7b19bbbf..5778b775175c18b80997eb7d2654eddcedd38269 100644
--- a/test/integration/util/minikube_runner.go
+++ b/test/integration/util/minikube_runner.go
@@ -290,7 +290,7 @@ func (m *MinikubeRunner) Status() (status string, stderr string, err error) {
 		return err
 	}
 	err = RetryX(s, 2*time.Minute)
-	if err != nil && status != state.None.String() {
+	if err != nil && status == state.None.String() {
 		err = nil // because https://github.com/kubernetes/minikube/issues/4932
 	}
 	return status, stderr, err
@@ -319,7 +319,7 @@ func (m *MinikubeRunner) CheckStatusNoFail(desired string) error {
 	}
 
 	if err != nil {
-		err = errors.Wrapf(err, stderr)
+		return errors.Wrapf(err, stderr)
 	}
-	return err
+	return nil
 }