diff --git a/cmd/kubeadm/app/master/manifests_test.go b/cmd/kubeadm/app/master/manifests_test.go
index 270ceb4fd01..3b2a013a4ab 100644
--- a/cmd/kubeadm/app/master/manifests_test.go
+++ b/cmd/kubeadm/app/master/manifests_test.go
@@ -33,7 +33,7 @@ func TestWriteStaticPodManifests(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Couldn't create tmpdir")
 	}
-	defer os.Remove(tmpdir)
+	defer os.RemoveAll(tmpdir)
 
 	// set up tmp GlobalEnvParams values for testing
 	oldEnv := kubeadmapi.GlobalEnvParams
diff --git a/cmd/kubeadm/app/phases/certs/pki_helpers_test.go b/cmd/kubeadm/app/phases/certs/pki_helpers_test.go
index a0e72f4a3ad..c3699f53548 100644
--- a/cmd/kubeadm/app/phases/certs/pki_helpers_test.go
+++ b/cmd/kubeadm/app/phases/certs/pki_helpers_test.go
@@ -121,7 +121,7 @@ func TestWriteKeysAndCert(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Couldn't create tmpdir")
 	}
-	defer os.Remove(tmpdir)
+	defer os.RemoveAll(tmpdir)
 
 	caKey, err := rsa.GenerateKey(rand.Reader, 2048)
 	if err != nil {
diff --git a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go
index b543226751d..d85bf3ded3a 100644
--- a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go
+++ b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go
@@ -142,7 +142,7 @@ func TestWriteKubeconfigToDisk(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Couldn't create tmpdir")
 	}
-	defer os.Remove(tmpdir)
+	defer os.RemoveAll(tmpdir)
 
 	// set up tmp GlobalEnvParams values for testing
 	oldEnv := kubeadmapi.GlobalEnvParams
diff --git a/pkg/client/unversioned/clientcmd/loader_test.go b/pkg/client/unversioned/clientcmd/loader_test.go
index 501850ba053..62d830c4970 100644
--- a/pkg/client/unversioned/clientcmd/loader_test.go
+++ b/pkg/client/unversioned/clientcmd/loader_test.go
@@ -129,7 +129,7 @@ func TestErrorReadingNonFile(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Couldn't create tmpdir")
 	}
-	defer os.Remove(tmpdir)
+	defer os.RemoveAll(tmpdir)
 
 	loadingRules := ClientConfigLoadingRules{
 		ExplicitPath: tmpdir,
@@ -224,14 +224,15 @@ func TestResolveRelativePaths(t *testing.T) {
 	}
 
 	configDir1, _ := ioutil.TempDir("", "")
+	defer os.RemoveAll(configDir1)
 	configFile1 := path.Join(configDir1, ".kubeconfig")
 	configDir1, _ = filepath.Abs(configDir1)
-	defer os.Remove(configFile1)
+
 	configDir2, _ := ioutil.TempDir("", "")
+	defer os.RemoveAll(configDir2)
 	configDir2, _ = ioutil.TempDir(configDir2, "")
 	configFile2 := path.Join(configDir2, ".kubeconfig")
 	configDir2, _ = filepath.Abs(configDir2)
-	defer os.Remove(configFile2)
 
 	WriteToFile(pathResolutionConfig1, configFile1)
 	WriteToFile(pathResolutionConfig2, configFile2)
diff --git a/pkg/kubelet/cm/container_manager_linux_test.go b/pkg/kubelet/cm/container_manager_linux_test.go
index 37a4d645044..31e8c5356c9 100644
--- a/pkg/kubelet/cm/container_manager_linux_test.go
+++ b/pkg/kubelet/cm/container_manager_linux_test.go
@@ -152,6 +152,7 @@ func TestSoftRequirementsValidationSuccess(t *testing.T) {
 	req := require.New(t)
 	tempDir, err := ioutil.TempDir("", "")
 	req.NoError(err)
+	defer os.RemoveAll(tempDir)
 	req.NoError(ioutil.WriteFile(path.Join(tempDir, "cpu.cfs_period_us"), []byte("0"), os.ModePerm))
 	req.NoError(ioutil.WriteFile(path.Join(tempDir, "cpu.cfs_quota_us"), []byte("0"), os.ModePerm))
 	mountInt := &fakeMountInterface{