diff --git a/modules/cache/cache_test.go b/modules/cache/cache_test.go
index 1c8f7d55ba..0429966ce9 100644
--- a/modules/cache/cache_test.go
+++ b/modules/cache/cache_test.go
@@ -18,6 +18,7 @@ func createTestCache() {
 		Adapter: "memory",
 		TTL:     time.Minute,
 	})
+	setting.CacheService.TTL = 30
 }
 
 func TestNewContext(t *testing.T) {
@@ -54,12 +55,12 @@ func TestGetString(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, "", data)
 
-	// data, err = GetString("key", func() (string, error) {
-	// 	return "some data", nil
-	// })
-	// assert.NoError(t, err)
-	// assert.Equal(t, "", data)
-	// Remove("key")
+	data, err = GetString("key", func() (string, error) {
+		return "some data", nil
+	})
+	assert.NoError(t, err)
+	assert.Equal(t, "", data)
+	Remove("key")
 
 	data, err = GetString("key", func() (string, error) {
 		return "some data", nil
@@ -67,13 +68,12 @@ func TestGetString(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, "some data", data)
 
-	// data, err = GetString("key", func() (string, error) {
-	// 	return "", fmt.Errorf("some error")
-	// })
-	// assert.NoError(t, err)
-	// assert.Equal(t, "some data", data)
-
-	// TODO: uncommented code works in IDE but not with go test
+	data, err = GetString("key", func() (string, error) {
+		return "", fmt.Errorf("some error")
+	})
+	assert.NoError(t, err)
+	assert.Equal(t, "some data", data)
+	Remove("key")
 }
 
 func TestGetInt(t *testing.T) {
@@ -91,12 +91,12 @@ func TestGetInt(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, 0, data)
 
-	// data, err = GetInt("key", func() (int, error) {
-	// 	return 100, nil
-	// })
-	// assert.NoError(t, err)
-	// assert.Equal(t, 0, data)
-	// Remove("key")
+	data, err = GetInt("key", func() (int, error) {
+		return 100, nil
+	})
+	assert.NoError(t, err)
+	assert.Equal(t, 0, data)
+	Remove("key")
 
 	data, err = GetInt("key", func() (int, error) {
 		return 100, nil
@@ -104,13 +104,12 @@ func TestGetInt(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, 100, data)
 
-	// data, err = GetInt("key", func() (int, error) {
-	// 	return 0, fmt.Errorf("some error")
-	// })
-	// assert.NoError(t, err)
-	// assert.Equal(t, 100, data)
-
-	// TODO: uncommented code works in IDE but not with go test
+	data, err = GetInt("key", func() (int, error) {
+		return 0, fmt.Errorf("some error")
+	})
+	assert.NoError(t, err)
+	assert.Equal(t, 100, data)
+	Remove("key")
 }
 
 func TestGetInt64(t *testing.T) {
@@ -128,12 +127,12 @@ func TestGetInt64(t *testing.T) {
 	assert.NoError(t, err)
 	assert.EqualValues(t, 0, data)
 
-	// data, err = GetInt64("key", func() (int64, error) {
-	// 	return 100, nil
-	// })
-	// assert.NoError(t, err)
-	// assert.EqualValues(t, 0, data)
-	// Remove("key")
+	data, err = GetInt64("key", func() (int64, error) {
+		return 100, nil
+	})
+	assert.NoError(t, err)
+	assert.EqualValues(t, 0, data)
+	Remove("key")
 
 	data, err = GetInt64("key", func() (int64, error) {
 		return 100, nil
@@ -141,11 +140,10 @@ func TestGetInt64(t *testing.T) {
 	assert.NoError(t, err)
 	assert.EqualValues(t, 100, data)
 
-	// data, err = GetInt64("key", func() (int, error) {
-	// 	return 0, fmt.Errorf("some error")
-	// })
-	// assert.NoError(t, err)
-	// assert.EqualValues(t, 100, data)
-
-	// TODO: uncommented code works in IDE but not with go test
+	data, err = GetInt64("key", func() (int64, error) {
+		return 0, fmt.Errorf("some error")
+	})
+	assert.NoError(t, err)
+	assert.EqualValues(t, 100, data)
+	Remove("key")
 }