diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
index 46f534ed0..0204249fd 100644
--- a/pkg/storage/storage.go
+++ b/pkg/storage/storage.go
@@ -107,6 +107,7 @@ func (s *Storage) ListFilterAny(filters ...FilterFunc) ([]*rspb.Release, error)
 // Init initializes a new storage backend with the driver d.
 // If d is nil, the default in-memory driver is used.
 func Init(d driver.Driver) *Storage {
+	// default driver is in memory
 	if d == nil {
 		d = driver.NewMemory()
 	}
diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go
index 3ad66f702..25975bf1b 100644
--- a/pkg/storage/storage_test.go
+++ b/pkg/storage/storage_test.go
@@ -25,9 +25,10 @@ import (
 	"k8s.io/helm/pkg/storage/driver"
 )
 
-var storage = Init(driver.NewMemory())
-
 func TestStorageCreate(t *testing.T) {
+	// initialize storage
+	storage := Init(driver.NewMemory())
+
 	// create fake release
 	rls := ReleaseTestData{Name: "angry-beaver"}.ToRelease()
 	assertErrNil(t.Fatal, storage.Create(rls), "StoreRelease")
@@ -43,6 +44,9 @@ func TestStorageCreate(t *testing.T) {
 }
 
 func TestStorageUpdate(t *testing.T) {
+	// initialize storage
+	storage := Init(driver.NewMemory())
+
 	// create fake release
 	rls := ReleaseTestData{Name: "angry-beaver"}.ToRelease()
 	assertErrNil(t.Fatal, storage.Create(rls), "StoreRelease")
@@ -63,6 +67,9 @@ func TestStorageUpdate(t *testing.T) {
 }
 
 func TestStorageDelete(t *testing.T) {
+	// initialize storage
+	storage := Init(driver.NewMemory())
+
 	// create fake release
 	rls := ReleaseTestData{Name: "angry-beaver"}.ToRelease()
 	assertErrNil(t.Fatal, storage.Create(rls), "StoreRelease")
@@ -78,6 +85,9 @@ func TestStorageDelete(t *testing.T) {
 }
 
 func TestStorageList(t *testing.T) {
+	// initialize storage
+	storage := Init(driver.NewMemory())
+
 	// setup storage with test releases
 	setup := func() {
 		// release records