diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go
index 66be142ef..4b2d4fc5a 100644
--- a/cmd/helm/helm_test.go
+++ b/cmd/helm/helm_test.go
@@ -46,12 +46,6 @@ var testingDir string
 func testTimestamper() time.Time { return time.Unix(242085845, 0).UTC() }
 
 func init() {
-	var err error
-	testingDir, err = ioutil.TempDir(testingDir, "helm")
-	if err != nil {
-		panic(err)
-	}
-
 	action.Timestamper = testTimestamper
 }
 
@@ -64,10 +58,11 @@ func TestMain(m *testing.M) {
 
 func testTempDir(t *testing.T) string {
 	t.Helper()
-	d, err := ioutil.TempDir(testingDir, "helm")
+	d, err := ioutil.TempDir("", "helm")
 	if err != nil {
 		t.Fatal(err)
 	}
+	testingDir = d
 	return d
 }
 
diff --git a/pkg/helm/helmpath/helmhome_windows_test.go b/pkg/helm/helmpath/helmhome_windows_test.go
index 67742841d..9f14909f6 100644
--- a/pkg/helm/helmpath/helmhome_windows_test.go
+++ b/pkg/helm/helmpath/helmhome_windows_test.go
@@ -28,10 +28,10 @@ func TestHelmHome(t *testing.T) {
 	}
 
 	isEq(t, hh.String(), "r:\\users\\helmtest")
-	isEq(t, hh.Repository(), "r:\\users\\helmtestrepository")
-	isEq(t, hh.RepositoryFile(), "r:\\users\\helmtestrepository\\repositories.yaml")
-	isEq(t, hh.Cache(), "r:\\users\\helmtestrepository\\cache")
-	isEq(t, hh.CacheIndex("t"), "r:\\users\\helmtestrepository\\cache\\t-index.yaml")
-	isEq(t, hh.Starters(), "r:\\users\\helmteststarters")
-	isEq(t, hh.Archive(), "r:\\users\\helmtestcache\\archive")
+	isEq(t, hh.Repository(), "r:\\users\\helmtest\\repository")
+	isEq(t, hh.RepositoryFile(), "r:\\users\\helmtest\\repository\\repositories.yaml")
+	isEq(t, hh.Cache(), "r:\\users\\helmtest\\repository\\cache")
+	isEq(t, hh.CacheIndex("t"), "r:\\users\\helmtest\\repository\\cache\\t-index.yaml")
+	isEq(t, hh.Starters(), "r:\\users\\helmtest\\starters")
+	isEq(t, hh.Archive(), "r:\\users\\helmtest\\cache\\archive")
 }