diff --git a/pkg/registry/.gitignore b/pkg/registry/.gitignore
deleted file mode 100644
index 04a480749..000000000
--- a/pkg/registry/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-helm-registry-test
\ No newline at end of file
diff --git a/pkg/registry/client_test.go b/pkg/registry/client_test.go
index db1f777f0..7a81805d4 100644
--- a/pkg/registry/client_test.go
+++ b/pkg/registry/client_test.go
@@ -35,15 +35,20 @@ import (
 	"github.com/stretchr/testify/suite"
 )
 
+var (
+	testCacheRootDir = "helm-registry-test"
+)
+
 type RegistryClientTestSuite struct {
 	suite.Suite
 	Out                io.Writer
 	DockerRegistryHost string
+	CacheRootDir       string
 	RegistryClient     *Client
 }
 
 func (suite *RegistryClientTestSuite) SetupSuite() {
-	os.RemoveAll("helm-registry-test")
+	suite.CacheRootDir = testCacheRootDir
 
 	// Init test client
 	var out bytes.Buffer
@@ -53,7 +58,7 @@ func (suite *RegistryClientTestSuite) SetupSuite() {
 		Resolver: Resolver{
 			Resolver: docker.NewResolver(docker.ResolverOptions{}),
 		},
-		CacheRootDir: "helm-registry-test",
+		CacheRootDir: suite.CacheRootDir,
 	})
 
 	// Registry config
@@ -73,6 +78,10 @@ func (suite *RegistryClientTestSuite) SetupSuite() {
 	go dockerRegistry.ListenAndServe()
 }
 
+func (suite *RegistryClientTestSuite) TearDownSuite() {
+	os.RemoveAll(suite.CacheRootDir)
+}
+
 func (suite *RegistryClientTestSuite) Test_0_SaveChart() {
 	ref, err := ParseReference(fmt.Sprintf("%s/testrepo/testchart:1.2.3", suite.DockerRegistryHost))
 	suite.Nil(err)