diff --git a/promql/test.go b/promql/test.go
index 26a9a4169..2ca105efa 100644
--- a/promql/test.go
+++ b/promql/test.go
@@ -469,7 +469,7 @@ func (t *Test) clear() {
 	}
 
 	var closer testutil.Closer
-	t.storage, closer = local.NewTestStorage(t, 1)
+	t.storage, closer = local.NewTestStorage(t, 2)
 
 	t.closeStorage = closer.Close
 	t.queryEngine = NewEngine(t.storage, nil)
diff --git a/rules/recording_test.go b/rules/recording_test.go
index 9e9929e7d..310df2fe4 100644
--- a/rules/recording_test.go
+++ b/rules/recording_test.go
@@ -24,7 +24,7 @@ import (
 )
 
 func TestRuleEval(t *testing.T) {
-	storage, closer := local.NewTestStorage(t, 1)
+	storage, closer := local.NewTestStorage(t, 2)
 	defer closer.Close()
 	engine := promql.NewEngine(storage, nil)
 	now := model.Now()
diff --git a/storage/local/storage_test.go b/storage/local/storage_test.go
index b871bef94..1a60ba97f 100644
--- a/storage/local/storage_test.go
+++ b/storage/local/storage_test.go
@@ -31,7 +31,7 @@ import (
 )
 
 func TestMatches(t *testing.T) {
-	storage, closer := NewTestStorage(t, 1)
+	storage, closer := NewTestStorage(t, 2)
 	defer closer.Close()
 
 	storage.archiveHighWatermark = 90
@@ -266,7 +266,7 @@ func TestMatches(t *testing.T) {
 }
 
 func TestFingerprintsForLabels(t *testing.T) {
-	storage, closer := NewTestStorage(t, 1)
+	storage, closer := NewTestStorage(t, 2)
 	defer closer.Close()
 
 	samples := make([]*model.Sample, 100)
@@ -348,7 +348,7 @@ func TestFingerprintsForLabels(t *testing.T) {
 var benchLabelMatchingRes map[model.Fingerprint]metric.Metric
 
 func BenchmarkLabelMatching(b *testing.B) {
-	s, closer := NewTestStorage(b, 1)
+	s, closer := NewTestStorage(b, 2)
 	defer closer.Close()
 
 	h := fnv.New64a()
@@ -444,7 +444,7 @@ func TestRetentionCutoff(t *testing.T) {
 	now := model.Now()
 	insertStart := now.Add(-2 * time.Hour)
 
-	s, closer := NewTestStorage(t, 1)
+	s, closer := NewTestStorage(t, 2)
 	defer closer.Close()
 
 	// Stop maintenance loop to prevent actual purging.
@@ -498,7 +498,7 @@ func TestDropMetrics(t *testing.T) {
 	now := model.Now()
 	insertStart := now.Add(-2 * time.Hour)
 
-	s, closer := NewTestStorage(t, 1)
+	s, closer := NewTestStorage(t, 2)
 	defer closer.Close()
 
 	chunkFileExists := func(fp model.Fingerprint) (bool, error) {
@@ -605,7 +605,7 @@ func TestQuarantineMetric(t *testing.T) {
 	now := model.Now()
 	insertStart := now.Add(-2 * time.Hour)
 
-	s, closer := NewTestStorage(t, 1)
+	s, closer := NewTestStorage(t, 2)
 	defer closer.Close()
 
 	chunkFileExists := func(fp model.Fingerprint) (bool, error) {
@@ -1763,7 +1763,7 @@ func verifyStorageSequential(t testing.TB, s *memorySeriesStorage, samples model
 }
 
 func TestAppendOutOfOrder(t *testing.T) {
-	s, closer := NewTestStorage(t, 1)
+	s, closer := NewTestStorage(t, 2)
 	defer closer.Close()
 
 	m := model.Metric{
diff --git a/template/template_test.go b/template/template_test.go
index 0dd46a4fd..7a39b3622 100644
--- a/template/template_test.go
+++ b/template/template_test.go
@@ -189,7 +189,7 @@ func TestTemplateExpansion(t *testing.T) {
 
 	time := model.Time(0)
 
-	storage, closer := local.NewTestStorage(t, 1)
+	storage, closer := local.NewTestStorage(t, 2)
 	defer closer.Close()
 	storage.Append(&model.Sample{
 		Metric: model.Metric{
diff --git a/web/api/legacy/api_test.go b/web/api/legacy/api_test.go
index 770e0af0e..e6ef21805 100644
--- a/web/api/legacy/api_test.go
+++ b/web/api/legacy/api_test.go
@@ -87,7 +87,7 @@ func TestQuery(t *testing.T) {
 		},
 	}
 
-	storage, closer := local.NewTestStorage(t, 1)
+	storage, closer := local.NewTestStorage(t, 2)
 	defer closer.Close()
 	storage.Append(&model.Sample{
 		Metric: model.Metric{