diff --git a/pkg/infra/distcache/database_storage_integration_test.go b/pkg/infra/distcache/database_storage_integration_test.go
index b8f564f9710..fac430e7e8d 100644
--- a/pkg/infra/distcache/database_storage_integration_test.go
+++ b/pkg/infra/distcache/database_storage_integration_test.go
@@ -3,6 +3,5 @@ package distcache
 import "testing"
 
 func TestIntegrationDatabaseCacheStorage(t *testing.T) {
-
-	RunTestsForClient(t, createTestClient(t, "database"))
+	runTestsForClient(t, createTestClient(t, "database"))
 }
diff --git a/pkg/infra/distcache/distcache_test.go b/pkg/infra/distcache/distcache_test.go
index a40066b788f..33a6d2c9c7b 100644
--- a/pkg/infra/distcache/distcache_test.go
+++ b/pkg/infra/distcache/distcache_test.go
@@ -26,19 +26,13 @@ func createTestClient(t *testing.T, name string) cacheStorage {
 	return createClient(CacheOpts{name: name}, sqlstore)
 }
 
-func TestMemoryStorageClient(t *testing.T) {
-
-	client := createTestClient(t, "memory")
-	RunTestsForClient(t, client)
+func runTestsForClient(t *testing.T, client cacheStorage) {
+	canPutGetAndDeleteCachedObjects(t, client)
+	canNotFetchExpiredItems(t, client)
+	canSetInfiniteCacheExpiration(t, client)
 }
 
-func RunTestsForClient(t *testing.T, client cacheStorage) {
-	CanPutGetAndDeleteCachedObjects(t, client)
-	CanNotFetchExpiredItems(t, client)
-	CanSetInfiniteCacheExpiration(t, client)
-}
-
-func CanPutGetAndDeleteCachedObjects(t *testing.T, client cacheStorage) {
+func canPutGetAndDeleteCachedObjects(t *testing.T, client cacheStorage) {
 	cacheableStruct := CacheableStruct{String: "hej", Int64: 2000}
 
 	err := client.Put("key", cacheableStruct, 0)
@@ -58,7 +52,7 @@ func CanPutGetAndDeleteCachedObjects(t *testing.T, client cacheStorage) {
 	assert.Equal(t, err, ErrCacheItemNotFound)
 }
 
-func CanNotFetchExpiredItems(t *testing.T, client cacheStorage) {
+func canNotFetchExpiredItems(t *testing.T, client cacheStorage) {
 	cacheableStruct := CacheableStruct{String: "hej", Int64: 2000}
 
 	err := client.Put("key", cacheableStruct, time.Second)
@@ -72,7 +66,7 @@ func CanNotFetchExpiredItems(t *testing.T, client cacheStorage) {
 	assert.Equal(t, err, ErrCacheItemNotFound)
 }
 
-func CanSetInfiniteCacheExpiration(t *testing.T, client cacheStorage) {
+func canSetInfiniteCacheExpiration(t *testing.T, client cacheStorage) {
 	cacheableStruct := CacheableStruct{String: "hej", Int64: 2000}
 
 	// insert cache item one day back
diff --git a/pkg/infra/distcache/memcached_storage_test.go b/pkg/infra/distcache/memcached_storage_test.go
index 524a4fcea10..de784730e4a 100644
--- a/pkg/infra/distcache/memcached_storage_test.go
+++ b/pkg/infra/distcache/memcached_storage_test.go
@@ -3,5 +3,5 @@ package distcache
 import "testing"
 
 func TestMemcachedCacheStorage(t *testing.T) {
-	RunTestsForClient(t, createTestClient(t, "memcache"))
+	runTestsForClient(t, createTestClient(t, "memcache"))
 }
diff --git a/pkg/infra/distcache/memory_storage_test.go b/pkg/infra/distcache/memory_storage_test.go
new file mode 100644
index 00000000000..cbf4c3790af
--- /dev/null
+++ b/pkg/infra/distcache/memory_storage_test.go
@@ -0,0 +1,7 @@
+package distcache
+
+import "testing"
+
+func TestMemoryCacheStorage(t *testing.T) {
+	runTestsForClient(t, createTestClient(t, "memory"))
+}
diff --git a/pkg/infra/distcache/redis_storage_test.go b/pkg/infra/distcache/redis_storage_test.go
index 6ba093a205c..b33d2b22e53 100644
--- a/pkg/infra/distcache/redis_storage_test.go
+++ b/pkg/infra/distcache/redis_storage_test.go
@@ -3,5 +3,5 @@ package distcache
 import "testing"
 
 func TestRedisCacheStorage(t *testing.T) {
-	RunTestsForClient(t, createTestClient(t, "redis"))
+	runTestsForClient(t, createTestClient(t, "redis"))
 }