diff --git a/redis/redis.go b/redis/redis.go
index 576a417e..eff32227 100644
--- a/redis/redis.go
+++ b/redis/redis.go
@@ -121,12 +121,12 @@ func (s *Storage) Conn() redis.UniversalClient {
 func (s *Storage) Keys() ([][]byte, error) {
 	var keys [][]byte
 	var cursor uint64
+	var err error
 
 	for {
 		var batch []string
-		var err error
-		batch, cursor, err = s.db.Scan(context.Background(), cursor, "*", 10).Result()
-		if err != nil {
+
+		if batch, cursor, err = s.db.Scan(context.Background(), cursor, "*", 10).Result(); err != nil {
 			return nil, err
 		}
 
diff --git a/redis/redis_test.go b/redis/redis_test.go
index 13b11abe..1d1685a9 100644
--- a/redis/redis_test.go
+++ b/redis/redis_test.go
@@ -9,12 +9,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var testStore = New(Config{
-	Reset: true,
-})
-
 func Test_Redis_Set(t *testing.T) {
 	var (
+		testStore = New(Config{
+			Reset: true,
+		})
 		key = "john"
 		val = []byte("doe")
 	)
@@ -25,6 +24,9 @@ func Test_Redis_Set(t *testing.T) {
 
 func Test_Redis_Set_Override(t *testing.T) {
 	var (
+		testStore = New(Config{
+			Reset: true,
+		})
 		key = "john"
 		val = []byte("doe")
 	)
@@ -42,6 +44,9 @@ func Test_Redis_Set_Override(t *testing.T) {
 
 func Test_Redis_Get(t *testing.T) {
 	var (
+		testStore = New(Config{
+			Reset: true,
+		})
 		key = "john"
 		val = []byte("doe")
 	)
@@ -60,6 +65,9 @@ func Test_Redis_Get(t *testing.T) {
 
 func Test_Redis_Expiration(t *testing.T) {
 	var (
+		testStore = New(Config{
+			Reset: true,
+		})
 		key = "john"
 		val = []byte("doe")
 		exp = 1 * time.Second
@@ -80,6 +88,9 @@ func Test_Redis_Expiration(t *testing.T) {
 }
 
 func Test_Redis_Get_NotExist(t *testing.T) {
+	testStore := New(Config{
+		Reset: true,
+	})
 	result, err := testStore.Get("notexist")
 	require.NoError(t, err)
 	require.Zero(t, len(result))
@@ -87,6 +98,9 @@ func Test_Redis_Get_NotExist(t *testing.T) {
 
 func Test_Redis_Delete(t *testing.T) {
 	var (
+		testStore = New(Config{
+			Reset: true,
+		})
 		key = "john"
 		val = []byte("doe")
 	)
@@ -107,6 +121,9 @@ func Test_Redis_Delete(t *testing.T) {
 }
 
 func Test_Redis_Reset(t *testing.T) {
+	testStore := New(Config{
+		Reset: true,
+	})
 	val := []byte("doe")
 
 	err := testStore.Set("john1", val, 0)
@@ -136,10 +153,16 @@ func Test_Redis_Reset(t *testing.T) {
 }
 
 func Test_Redis_Close(t *testing.T) {
+	testStore := New(Config{
+		Reset: true,
+	})
 	require.Nil(t, testStore.Close())
 }
 
 func Test_Redis_Conn(t *testing.T) {
+	testStore := New(Config{
+		Reset: true,
+	})
 	require.True(t, testStore.Conn() != nil)
 }
 
@@ -204,7 +227,7 @@ func Test_Redis_Initalize_WithURL_TLS(t *testing.T) {
 	err = testStoreUrl.Delete(key)
 	require.NoError(t, err)
 
-	keys, err := testStore.Keys()
+	keys, err := testStoreUrl.Keys()
 	require.NoError(t, err)
 	require.Zero(t, keys)
 
@@ -250,7 +273,7 @@ func Test_Redis_Initalize_WithURL_TLS_Verify(t *testing.T) {
 	err = testStoreUrl.Delete(key)
 	require.NoError(t, err)
 
-	keys, err := testStore.Keys()
+	keys, err := testStoreUrl.Keys()
 	require.NoError(t, err)
 	require.Zero(t, keys)
 
@@ -277,7 +300,7 @@ func Test_Redis_Initalize_With_Secure_URL(t *testing.T) {
 	err = testStoreUrl.Delete(key)
 	require.NoError(t, err)
 
-	keys, err := testStore.Keys()
+	keys, err := testStoreUrl.Keys()
 	require.NoError(t, err)
 	require.Zero(t, keys)
 
@@ -305,7 +328,7 @@ func Test_Redis_Universal_Addrs(t *testing.T) {
 	err = testStoreUniversal.Delete(key)
 	require.NoError(t, err)
 
-	keys, err := testStore.Keys()
+	keys, err := testStoreUniversal.Keys()
 	require.NoError(t, err)
 	require.Zero(t, keys)
 
@@ -335,7 +358,7 @@ func Test_Redis_Universal_With_URL_Undefined(t *testing.T) {
 	err = testStoreUniversal.Delete(key)
 	require.NoError(t, err)
 
-	keys, err := testStore.Keys()
+	keys, err := testStoreUniversal.Keys()
 	require.NoError(t, err)
 	require.Zero(t, keys)
 
@@ -365,7 +388,7 @@ func Test_Redis_Universal_With_URL_Defined(t *testing.T) {
 	err = testStoreUniversal.Delete(key)
 	require.NoError(t, err)
 
-	keys, err := testStore.Keys()
+	keys, err := testStoreUniversal.Keys()
 	require.NoError(t, err)
 	require.Zero(t, keys)
 
@@ -396,7 +419,7 @@ func Test_Redis_Universal_With_HostPort(t *testing.T) {
 	err = testStoreUniversal.Delete(key)
 	require.NoError(t, err)
 
-	keys, err := testStore.Keys()
+	keys, err := testStoreUniversal.Keys()
 	require.NoError(t, err)
 	require.Zero(t, keys)
 
@@ -428,7 +451,7 @@ func Test_Redis_Universal_With_HostPort_And_URL(t *testing.T) {
 	err = testStoreUniversal.Delete(key)
 	require.NoError(t, err)
 
-	keys, err := testStore.Keys()
+	keys, err := testStoreUniversal.Keys()
 	require.NoError(t, err)
 	require.Zero(t, keys)
 
@@ -462,7 +485,7 @@ func Test_Redis_Cluster(t *testing.T) {
 	err = testStoreUniversal.Delete(key)
 	require.NoError(t, err)
 
-	keys, err := testStore.Keys()
+	keys, err := testStoreUniversal.Keys()
 	require.NoError(t, err)
 	require.Zero(t, keys)
 
@@ -470,6 +493,9 @@ func Test_Redis_Cluster(t *testing.T) {
 }
 
 func Benchmark_Redis_Set(b *testing.B) {
+	testStore := New(Config{
+		Reset: true,
+	})
 	b.ReportAllocs()
 	b.ResetTimer()
 
@@ -482,6 +508,9 @@ func Benchmark_Redis_Set(b *testing.B) {
 }
 
 func Benchmark_Redis_Get(b *testing.B) {
+	testStore := New(Config{
+		Reset: true,
+	})
 	err := testStore.Set("john", []byte("doe"), 0)
 	require.NoError(b, err)
 
@@ -496,6 +525,9 @@ func Benchmark_Redis_Get(b *testing.B) {
 }
 
 func Benchmark_Redis_SetAndDelete(b *testing.B) {
+	testStore := New(Config{
+		Reset: true,
+	})
 	b.ReportAllocs()
 	b.ResetTimer()