diff --git a/pkg/addons/addons_test.go b/pkg/addons/addons_test.go
index 86a14203ee789369adba00d865f8809e96d70a75..a85051ee25ba2a5b74a22eb77fcfa7a9b632357c 100644
--- a/pkg/addons/addons_test.go
+++ b/pkg/addons/addons_test.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/tests"
 )
 
 func createTestProfile(t *testing.T) string {
@@ -35,6 +36,13 @@ func createTestProfile(t *testing.T) string {
 		t.Fatalf("tempdir: %v", err)
 	}
 
+	t.Cleanup(func() {
+		err := os.RemoveAll(td)
+		t.Logf("remove path %q", td)
+		if err != nil {
+			t.Errorf("failed to clean up temp folder  %q", td)
+		}
+	})
 	err = os.Setenv(localpath.MinikubeHome, td)
 	if err != nil {
 		t.Errorf("error setting up test environment. could not set %s", localpath.MinikubeHome)
@@ -122,6 +130,10 @@ func TestSetAndSave(t *testing.T) {
 }
 
 func TestStart(t *testing.T) {
+	// this test will write a config.json into MinikubeHome, create a temp dir for it
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	cc := &config.ClusterConfig{
 		Name:             "start",
 		CPUs:             2,
diff --git a/pkg/minikube/localpath/localpath_test.go b/pkg/minikube/localpath/localpath_test.go
index 00f52d09da50f4f9f1eec21f3bc9c97d582ef772..782ae87c976721887b27b4dd2e8fea05dc09b35b 100644
--- a/pkg/minikube/localpath/localpath_test.go
+++ b/pkg/minikube/localpath/localpath_test.go
@@ -33,12 +33,12 @@ func TestReplaceWinDriveLetterToVolumeName(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error make tmp directory: %v", err)
 	}
-	defer func() { //clean up tempdir
+	defer func(path string) { //clean up tempdir
 		err := os.RemoveAll(path)
 		if err != nil {
 			t.Errorf("failed to clean up temp folder  %q", path)
 		}
-	}()
+	}(path)
 
 	if runtime.GOOS != "windows" {
 		// Replace to fake func.
diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go
index e5f39bd4545f6254b2c46852e66d8d0e7a59f405..58ebf8c698e0ea1c8bdd65f23f625f31082f5bc5 100644
--- a/pkg/minikube/machine/cluster_test.go
+++ b/pkg/minikube/machine/cluster_test.go
@@ -70,6 +70,9 @@ var defaultClusterConfig = config.ClusterConfig{
 }
 
 func TestCreateHost(t *testing.T) {
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	download.EnableMock(true)
 
 	RegisterMockDriver(t)
@@ -115,6 +118,9 @@ func TestCreateHost(t *testing.T) {
 }
 
 func TestStartHostExists(t *testing.T) {
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	download.EnableMock(true)
 
 	RegisterMockDriver(t)
@@ -154,6 +160,9 @@ func TestStartHostExists(t *testing.T) {
 }
 
 func TestStartHostErrMachineNotExist(t *testing.T) {
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	download.EnableMock(true)
 
 	RegisterMockDriver(t)
@@ -201,6 +210,9 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
 }
 
 func TestStartStoppedHost(t *testing.T) {
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	download.EnableMock(true)
 
 	RegisterMockDriver(t)
@@ -238,6 +250,9 @@ func TestStartStoppedHost(t *testing.T) {
 }
 
 func TestStartHost(t *testing.T) {
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	download.EnableMock(true)
 
 	RegisterMockDriver(t)
@@ -268,6 +283,9 @@ func TestStartHost(t *testing.T) {
 }
 
 func TestStartHostConfig(t *testing.T) {
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	download.EnableMock(true)
 
 	RegisterMockDriver(t)
@@ -310,6 +328,9 @@ func TestStopHostError(t *testing.T) {
 }
 
 func TestStopHost(t *testing.T) {
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 	h, err := createHost(api, &defaultClusterConfig, &config.Node{Name: "minikube"})
@@ -329,6 +350,9 @@ func TestStopHost(t *testing.T) {
 }
 
 func TestDeleteHost(t *testing.T) {
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 	if _, err := createHost(api, &defaultClusterConfig, &config.Node{Name: "minikube"}); err != nil {
@@ -344,6 +368,9 @@ func TestDeleteHost(t *testing.T) {
 }
 
 func TestDeleteHostErrorDeletingVM(t *testing.T) {
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 	h, err := createHost(api, &defaultClusterConfig, &config.Node{Name: "minikube"})
@@ -360,6 +387,9 @@ func TestDeleteHostErrorDeletingVM(t *testing.T) {
 }
 
 func TestDeleteHostErrorDeletingFiles(t *testing.T) {
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 	api.RemoveError = true
@@ -373,6 +403,9 @@ func TestDeleteHostErrorDeletingFiles(t *testing.T) {
 }
 
 func TestDeleteHostErrMachineNotExist(t *testing.T) {
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
 	// Create an incomplete host with machine does not exist error(i.e. User Interrupt Cancel)
@@ -388,6 +421,9 @@ func TestDeleteHostErrMachineNotExist(t *testing.T) {
 }
 
 func TestStatus(t *testing.T) {
+	tempDir := tests.MakeTempDir()
+	defer tests.RemoveTempDir(tempDir)
+
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)