diff --git a/tsdb/head.go b/tsdb/head.go
index 1ef88be36..728b3c9d3 100644
--- a/tsdb/head.go
+++ b/tsdb/head.go
@@ -2040,106 +2040,90 @@ func (h *Head) updateWALReplayStatusRead(current int) {
 
 func GenerateTestHistograms(n int) (r []*histogram.Histogram) {
 	for i := 0; i < n; i++ {
-		h := histogram.Histogram{
-			Count:         10 + uint64(i*8),
-			ZeroCount:     2 + uint64(i),
-			ZeroThreshold: 0.001,
-			Sum:           18.4 * float64(i+1),
-			Schema:        1,
-			PositiveSpans: []histogram.Span{
-				{Offset: 0, Length: 2},
-				{Offset: 1, Length: 2},
-			},
-			PositiveBuckets: []int64{int64(i + 1), 1, -1, 0},
-			NegativeSpans: []histogram.Span{
-				{Offset: 0, Length: 2},
-				{Offset: 1, Length: 2},
-			},
-			NegativeBuckets: []int64{int64(i + 1), 1, -1, 0},
-		}
+		h := GenerateTestHistogram(i)
 		if i > 0 {
 			h.CounterResetHint = histogram.NotCounterReset
 		}
-		r = append(r, &h)
+		r = append(r, h)
 	}
 	return r
 }
 
+// Generates a test histogram, it is up to the user to set any known counter reset hint.
+func GenerateTestHistogram(i int) *histogram.Histogram {
+	return &histogram.Histogram{
+		Count:         10 + uint64(i*8),
+		ZeroCount:     2 + uint64(i),
+		ZeroThreshold: 0.001,
+		Sum:           18.4 * float64(i+1),
+		Schema:        1,
+		PositiveSpans: []histogram.Span{
+			{Offset: 0, Length: 2},
+			{Offset: 1, Length: 2},
+		},
+		PositiveBuckets: []int64{int64(i + 1), 1, -1, 0},
+		NegativeSpans: []histogram.Span{
+			{Offset: 0, Length: 2},
+			{Offset: 1, Length: 2},
+		},
+		NegativeBuckets: []int64{int64(i + 1), 1, -1, 0},
+	}
+}
+
 func GenerateTestGaugeHistograms(n int) (r []*histogram.Histogram) {
 	for x := 0; x < n; x++ {
-		i := rand.Intn(n)
-		r = append(r, &histogram.Histogram{
-			CounterResetHint: histogram.GaugeType,
-			Count:            10 + uint64(i*8),
-			ZeroCount:        2 + uint64(i),
-			ZeroThreshold:    0.001,
-			Sum:              18.4 * float64(i+1),
-			Schema:           1,
-			PositiveSpans: []histogram.Span{
-				{Offset: 0, Length: 2},
-				{Offset: 1, Length: 2},
-			},
-			PositiveBuckets: []int64{int64(i + 1), 1, -1, 0},
-			NegativeSpans: []histogram.Span{
-				{Offset: 0, Length: 2},
-				{Offset: 1, Length: 2},
-			},
-			NegativeBuckets: []int64{int64(i + 1), 1, -1, 0},
-		})
+		r = append(r, GenerateTestGaugeHistogram(rand.Intn(n)))
 	}
 	return r
 }
 
+func GenerateTestGaugeHistogram(i int) *histogram.Histogram {
+	h := GenerateTestHistogram(i)
+	h.CounterResetHint = histogram.GaugeType
+	return h
+}
+
 func GenerateTestFloatHistograms(n int) (r []*histogram.FloatHistogram) {
 	for i := 0; i < n; i++ {
-		h := histogram.FloatHistogram{
-			Count:         10 + float64(i*8),
-			ZeroCount:     2 + float64(i),
-			ZeroThreshold: 0.001,
-			Sum:           18.4 * float64(i+1),
-			Schema:        1,
-			PositiveSpans: []histogram.Span{
-				{Offset: 0, Length: 2},
-				{Offset: 1, Length: 2},
-			},
-			PositiveBuckets: []float64{float64(i + 1), float64(i + 2), float64(i + 1), float64(i + 1)},
-			NegativeSpans: []histogram.Span{
-				{Offset: 0, Length: 2},
-				{Offset: 1, Length: 2},
-			},
-			NegativeBuckets: []float64{float64(i + 1), float64(i + 2), float64(i + 1), float64(i + 1)},
-		}
+		h := GenerateTestFloatHistogram(i)
 		if i > 0 {
 			h.CounterResetHint = histogram.NotCounterReset
 		}
-		r = append(r, &h)
+		r = append(r, h)
 	}
-
 	return r
 }
 
+// Generates a test float histogram, it is up to the user to set any known counter reset hint.
+func GenerateTestFloatHistogram(i int) *histogram.FloatHistogram {
+	return &histogram.FloatHistogram{
+		Count:         10 + float64(i*8),
+		ZeroCount:     2 + float64(i),
+		ZeroThreshold: 0.001,
+		Sum:           18.4 * float64(i+1),
+		Schema:        1,
+		PositiveSpans: []histogram.Span{
+			{Offset: 0, Length: 2},
+			{Offset: 1, Length: 2},
+		},
+		PositiveBuckets: []float64{float64(i + 1), float64(i + 2), float64(i + 1), float64(i + 1)},
+		NegativeSpans: []histogram.Span{
+			{Offset: 0, Length: 2},
+			{Offset: 1, Length: 2},
+		},
+		NegativeBuckets: []float64{float64(i + 1), float64(i + 2), float64(i + 1), float64(i + 1)},
+	}
+}
+
 func GenerateTestGaugeFloatHistograms(n int) (r []*histogram.FloatHistogram) {
 	for x := 0; x < n; x++ {
-		i := rand.Intn(n)
-		r = append(r, &histogram.FloatHistogram{
-			CounterResetHint: histogram.GaugeType,
-			Count:            10 + float64(i*8),
-			ZeroCount:        2 + float64(i),
-			ZeroThreshold:    0.001,
-			Sum:              18.4 * float64(i+1),
-			Schema:           1,
-			PositiveSpans: []histogram.Span{
-				{Offset: 0, Length: 2},
-				{Offset: 1, Length: 2},
-			},
-			PositiveBuckets: []float64{float64(i + 1), float64(i + 2), float64(i + 1), float64(i + 1)},
-			NegativeSpans: []histogram.Span{
-				{Offset: 0, Length: 2},
-				{Offset: 1, Length: 2},
-			},
-			NegativeBuckets: []float64{float64(i + 1), float64(i + 2), float64(i + 1), float64(i + 1)},
-		})
+		r = append(r, GenerateTestGaugeFloatHistogram(rand.Intn(n)))
 	}
-
 	return r
 }
+
+func GenerateTestGaugeFloatHistogram(i int) *histogram.FloatHistogram {
+	h := GenerateTestFloatHistogram(i)
+	h.CounterResetHint = histogram.GaugeType
+	return h
+}