diff --git a/lib/encoding/compress_test.go b/lib/encoding/compress_test.go
index 47b2d5d83c..7358a47a5b 100644
--- a/lib/encoding/compress_test.go
+++ b/lib/encoding/compress_test.go
@@ -11,7 +11,7 @@ func TestCompressDecompressZSTD(t *testing.T) {
 
 	r := rand.New(rand.NewSource(1))
 	var b []byte
-	for i := 0; i < 64*1024; i++ {
+	for range 64 * 1024 {
 		b = append(b, byte(r.Int31n(256)))
 	}
 	testCompressDecompressZSTD(t, b)
diff --git a/lib/encoding/encoding_cgo_test.go b/lib/encoding/encoding_cgo_test.go
index 738c3206a3..a5a6a0b2be 100644
--- a/lib/encoding/encoding_cgo_test.go
+++ b/lib/encoding/encoding_cgo_test.go
@@ -16,7 +16,7 @@ func TestMarshalUnmarshalInt64Array(t *testing.T) {
 	// Verify nearest delta encoding.
 	va = va[:0]
 	v = 0
-	for i := 0; i < 8*1024; i++ {
+	for range 8 * 1024 {
 		v += int64(r.NormFloat64() * 1e6)
 		va = append(va, v)
 	}
@@ -30,7 +30,7 @@ func TestMarshalUnmarshalInt64Array(t *testing.T) {
 	// Verify nearest delta2 encoding.
 	va = va[:0]
 	v = 0
-	for i := 0; i < 8*1024; i++ {
+	for range 8 * 1024 {
 		v += 30e6 + int64(r.NormFloat64()*1e6)
 		va = append(va, v)
 	}
@@ -44,7 +44,7 @@ func TestMarshalUnmarshalInt64Array(t *testing.T) {
 	// Verify nearest delta encoding.
 	va = va[:0]
 	v = 1000
-	for i := 0; i < 6; i++ {
+	for range 6 {
 		v += int64(r.NormFloat64() * 100)
 		va = append(va, v)
 	}
@@ -55,7 +55,7 @@ func TestMarshalUnmarshalInt64Array(t *testing.T) {
 	// Verify nearest delta2 encoding.
 	va = va[:0]
 	v = 0
-	for i := 0; i < 6; i++ {
+	for range 6 {
 		v += 3000 + int64(r.NormFloat64()*100)
 		va = append(va, v)
 	}
@@ -69,7 +69,7 @@ func TestMarshalInt64ArraySize(t *testing.T) {
 
 	var va []int64
 	v := int64(r.Float64() * 1e9)
-	for i := 0; i < 8*1024; i++ {
+	for range 8 * 1024 {
 		va = append(va, v)
 		v += 30e3 + int64(r.NormFloat64()*1e3)
 	}
diff --git a/lib/encoding/encoding_pure_test.go b/lib/encoding/encoding_pure_test.go
index befd6db063..6f7fb1b362 100644
--- a/lib/encoding/encoding_pure_test.go
+++ b/lib/encoding/encoding_pure_test.go
@@ -16,7 +16,7 @@ func TestMarshalUnmarshalInt64Array(t *testing.T) {
 	// Verify nearest delta encoding.
 	va = va[:0]
 	v = 0
-	for i := 0; i < 8*1024; i++ {
+	for range 8 * 1024 {
 		v += int64(r.NormFloat64() * 1e6)
 		va = append(va, v)
 	}
@@ -30,7 +30,7 @@ func TestMarshalUnmarshalInt64Array(t *testing.T) {
 	// Verify nearest delta2 encoding.
 	va = va[:0]
 	v = 0
-	for i := 0; i < 8*1024; i++ {
+	for range 8 * 1024 {
 		v += 30e6 + int64(r.NormFloat64()*1e6)
 		va = append(va, v)
 	}
@@ -44,7 +44,7 @@ func TestMarshalUnmarshalInt64Array(t *testing.T) {
 	// Verify nearest delta encoding.
 	va = va[:0]
 	v = 1000
-	for i := 0; i < 6; i++ {
+	for range 6 {
 		v += int64(r.NormFloat64() * 100)
 		va = append(va, v)
 	}
@@ -55,7 +55,7 @@ func TestMarshalUnmarshalInt64Array(t *testing.T) {
 	// Verify nearest delta2 encoding.
 	va = va[:0]
 	v = 0
-	for i := 0; i < 6; i++ {
+	for range 6 {
 		v += 3000 + int64(r.NormFloat64()*100)
 		va = append(va, v)
 	}
@@ -69,7 +69,7 @@ func TestMarshalInt64ArraySize(t *testing.T) {
 
 	var va []int64
 	v := int64(r.Float64() * 1e9)
-	for i := 0; i < 8*1024; i++ {
+	for range 8 * 1024 {
 		va = append(va, v)
 		v += 30e3 + int64(r.NormFloat64()*1e3)
 	}
diff --git a/lib/encoding/encoding_test.go b/lib/encoding/encoding_test.go
index 94d25b5f54..9fd543a40c 100644
--- a/lib/encoding/encoding_test.go
+++ b/lib/encoding/encoding_test.go
@@ -160,7 +160,7 @@ func TestMarshalUnmarshalTimestamps(t *testing.T) {
 
 	var timestamps []int64
 	v := int64(0)
-	for i := 0; i < 8*1024; i++ {
+	for range 8 * 1024 {
 		v += 30e3 * int64(r.NormFloat64()*5e2)
 		timestamps = append(timestamps, v)
 	}
@@ -180,7 +180,7 @@ func TestMarshalUnmarshalValues(t *testing.T) {
 
 	var values []int64
 	v := int64(0)
-	for i := 0; i < 8*1024; i++ {
+	for range 8 * 1024 {
 		v += int64(r.NormFloat64() * 1e2)
 		values = append(values, v)
 	}
diff --git a/lib/encoding/encoding_timing_test.go b/lib/encoding/encoding_timing_test.go
index 76843bd19f..cafced61be 100644
--- a/lib/encoding/encoding_timing_test.go
+++ b/lib/encoding/encoding_timing_test.go
@@ -45,7 +45,7 @@ var benchGaugeArray = func() []int64 {
 	r := rand.New(rand.NewSource(1))
 	a := make([]int64, 8*1024)
 	v := int64(0)
-	for i := 0; i < len(a); i++ {
+	for i := range a {
 		v += int64(r.NormFloat64() * 100)
 		a[i] = v
 	}
@@ -92,7 +92,7 @@ func BenchmarkUnmarshalDeltaConstArray(b *testing.B) {
 var benchDeltaConstArray = func() []int64 {
 	a := make([]int64, 8*1024)
 	v := int64(0)
-	for i := 0; i < len(a); i++ {
+	for i := range a {
 		v += 12345
 		a[i] = v
 	}
@@ -138,7 +138,7 @@ func BenchmarkUnmarshalConstArray(b *testing.B) {
 
 var benchConstArray = func() []int64 {
 	a := make([]int64, 8*1024)
-	for i := 0; i < len(a); i++ {
+	for i := range a {
 		a[i] = 1234567890
 	}
 	return a
@@ -234,7 +234,7 @@ var benchInt64Array = func() []int64 {
 	r := rand.New(rand.NewSource(1))
 	var a []int64
 	var v int64
-	for i := 0; i < 8*1024; i++ {
+	for range 8 * 1024 {
 		v += 30e3 + int64(r.NormFloat64()*1e3)
 		a = append(a, v)
 	}
diff --git a/lib/encoding/int_test.go b/lib/encoding/int_test.go
index f262b64702..a3c30120b3 100644
--- a/lib/encoding/int_test.go
+++ b/lib/encoding/int_test.go
@@ -14,7 +14,7 @@ func TestMarshalUnmarshalUint16(t *testing.T) {
 	testMarshalUnmarshalUint16(t, (1<<15)-1)
 	testMarshalUnmarshalUint16(t, 1<<15)
 
-	for i := uint16(0); i < 1e4; i++ {
+	for i := range uint16(1e4) {
 		testMarshalUnmarshalUint16(t, i)
 	}
 }
@@ -49,7 +49,7 @@ func TestMarshalUnmarshalUint32(t *testing.T) {
 	testMarshalUnmarshalUint32(t, (1<<31)-1)
 	testMarshalUnmarshalUint32(t, 1<<31)
 
-	for i := uint32(0); i < 1e4; i++ {
+	for i := range uint32(1e4) {
 		testMarshalUnmarshalUint32(t, i)
 	}
 }
@@ -84,7 +84,7 @@ func TestMarshalUnmarshalUint64(t *testing.T) {
 	testMarshalUnmarshalUint64(t, (1<<63)-1)
 	testMarshalUnmarshalUint64(t, 1<<63)
 
-	for i := uint64(0); i < 1e4; i++ {
+	for i := range uint64(1e4) {
 		testMarshalUnmarshalUint64(t, i)
 	}
 }
@@ -119,7 +119,7 @@ func TestMarshalUnmarshalInt16(t *testing.T) {
 	testMarshalUnmarshalInt16(t, (-1<<15)+1)
 	testMarshalUnmarshalInt16(t, (1<<15)-1)
 
-	for i := int16(0); i < 1e4; i++ {
+	for i := range int16(1e4) {
 		testMarshalUnmarshalInt16(t, i)
 		testMarshalUnmarshalInt16(t, -i)
 	}
@@ -155,7 +155,7 @@ func TestMarshalUnmarshalInt64(t *testing.T) {
 	testMarshalUnmarshalInt64(t, (-1<<63)+1)
 	testMarshalUnmarshalInt64(t, (1<<63)-1)
 
-	for i := int64(0); i < 1e4; i++ {
+	for i := range int64(1e4) {
 		testMarshalUnmarshalInt64(t, i)
 		testMarshalUnmarshalInt64(t, -i)
 	}
@@ -200,7 +200,7 @@ func TestMarshalUnmarshalVarInt64(t *testing.T) {
 	testMarshalUnmarshalVarInt64(t, (-1<<63)+1)
 	testMarshalUnmarshalVarInt64(t, (1<<63)-1)
 
-	for i := int64(0); i < 1e4; i++ {
+	for i := range int64(1e4) {
 		testMarshalUnmarshalVarInt64(t, i)
 		testMarshalUnmarshalVarInt64(t, -i)
 		testMarshalUnmarshalVarInt64(t, i<<8)
@@ -256,7 +256,7 @@ func TestMarshalUnmarshalVarUint64(t *testing.T) {
 	testMarshalUnmarshalVarInt64(t, (1<<13)+1)
 	testMarshalUnmarshalVarUint64(t, (1<<63)-1)
 
-	for i := uint64(0); i < 1024; i++ {
+	for i := range uint64(1024) {
 		testMarshalUnmarshalVarUint64(t, i)
 		testMarshalUnmarshalVarUint64(t, i<<8)
 		testMarshalUnmarshalVarUint64(t, i<<16)
@@ -301,7 +301,7 @@ func TestMarshalUnmarshalBytes(t *testing.T) {
 	testMarshalUnmarshalBytes(t, "xy")
 
 	var bb bytes.Buffer
-	for i := 0; i < 100; i++ {
+	for i := range 100 {
 		fmt.Fprintf(&bb, " %d ", i)
 		s := bb.String()
 		testMarshalUnmarshalBytes(t, s)
diff --git a/lib/encoding/int_timing_test.go b/lib/encoding/int_timing_test.go
index 602cf8486a..742f4f9b27 100644
--- a/lib/encoding/int_timing_test.go
+++ b/lib/encoding/int_timing_test.go
@@ -78,7 +78,7 @@ func benchmarkMarshalVarUint64s(b *testing.B, maxValue uint64) {
 	const numsCount = 8000
 	var data []uint64
 	n := maxValue
-	for i := 0; i < numsCount; i++ {
+	for range numsCount {
 		if n > maxValue {
 			n = maxValue
 		}
@@ -118,7 +118,7 @@ func benchmarkMarshalVarInt64s(b *testing.B, maxValue int64) {
 	const numsCount = 8000
 	var data []int64
 	n := maxValue
-	for i := 0; i < numsCount; i++ {
+	for range numsCount {
 		if n < -maxValue {
 			n = maxValue
 		}
@@ -158,7 +158,7 @@ func benchmarkUnmarshalVarUint64(b *testing.B, maxValue uint64) {
 	const numsCount = 8000
 	var data []byte
 	n := maxValue
-	for i := 0; i < numsCount; i++ {
+	for range numsCount {
 		if n > maxValue {
 			n = maxValue
 		}
@@ -204,7 +204,7 @@ func benchmarkUnmarshalVarUint64s(b *testing.B, maxValue uint64) {
 	const numsCount = 8000
 	var data []byte
 	n := maxValue
-	for i := 0; i < numsCount; i++ {
+	for range numsCount {
 		if n > maxValue {
 			n = maxValue
 		}
@@ -250,7 +250,7 @@ func benchmarkUnmarshalVarInt64(b *testing.B, maxValue int64) {
 	const numsCount = 8000
 	var data []byte
 	n := maxValue
-	for i := 0; i < numsCount; i++ {
+	for range numsCount {
 		if n < -maxValue {
 			n = maxValue
 		}
@@ -296,7 +296,7 @@ func benchmarkUnmarshalVarInt64s(b *testing.B, maxValue int64) {
 	const numsCount = 8000
 	var data []byte
 	n := maxValue
-	for i := 0; i < numsCount; i++ {
+	for range numsCount {
 		if n < -maxValue {
 			n = maxValue
 		}
diff --git a/lib/encoding/nearest_delta2_test.go b/lib/encoding/nearest_delta2_test.go
index 7a4586b4ab..a23ffddcc7 100644
--- a/lib/encoding/nearest_delta2_test.go
+++ b/lib/encoding/nearest_delta2_test.go
@@ -160,7 +160,7 @@ func TestMarshalUnmarshalInt64NearestDelta2(t *testing.T) {
 
 	// Verify constant encoding.
 	va := []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		va = append(va, 9876543210123)
 	}
 	testMarshalUnmarshalInt64NearestDelta2(t, va, 4)
@@ -169,7 +169,7 @@ func TestMarshalUnmarshalInt64NearestDelta2(t *testing.T) {
 	// Verify encoding for monotonically incremented va.
 	v := int64(-35)
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		v += 8
 		va = append(va, v)
 	}
@@ -179,7 +179,7 @@ func TestMarshalUnmarshalInt64NearestDelta2(t *testing.T) {
 	// Verify encoding for monotonically decremented va.
 	v = 793
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		v -= 16
 		va = append(va, v)
 	}
@@ -189,7 +189,7 @@ func TestMarshalUnmarshalInt64NearestDelta2(t *testing.T) {
 	// Verify encoding for quadratically incremented va.
 	v = -1234567
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for i := range 1024 {
 		v += 32 + int64(i)
 		va = append(va, v)
 	}
@@ -199,7 +199,7 @@ func TestMarshalUnmarshalInt64NearestDelta2(t *testing.T) {
 	// Verify encoding for decremented va with norm-float noise.
 	v = 787933
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		v -= 25 + int64(r.NormFloat64()*2)
 		va = append(va, v)
 	}
@@ -208,7 +208,7 @@ func TestMarshalUnmarshalInt64NearestDelta2(t *testing.T) {
 	// Verify encoding for incremented va with random noise.
 	v = 943854
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		v += 30 + r.Int63n(5)
 		va = append(va, v)
 	}
@@ -217,7 +217,7 @@ func TestMarshalUnmarshalInt64NearestDelta2(t *testing.T) {
 	// Verify encoding for constant va with norm-float noise.
 	v = -12345
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		v += int64(r.NormFloat64() * 10)
 		va = append(va, v)
 	}
@@ -226,7 +226,7 @@ func TestMarshalUnmarshalInt64NearestDelta2(t *testing.T) {
 	// Verify encoding for constant va with random noise.
 	v = -12345
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		v += r.Int63n(15) - 1
 		va = append(va, v)
 	}
diff --git a/lib/encoding/nearest_delta_test.go b/lib/encoding/nearest_delta_test.go
index 7a12209bbc..81b966755b 100644
--- a/lib/encoding/nearest_delta_test.go
+++ b/lib/encoding/nearest_delta_test.go
@@ -68,7 +68,7 @@ func TestMarshalUnmarshalInt64NearestDelta(t *testing.T) {
 
 	// Verify constant encoding.
 	va := []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		va = append(va, 9876543210123)
 	}
 	testMarshalUnmarshalInt64NearestDelta(t, va, 4)
@@ -77,7 +77,7 @@ func TestMarshalUnmarshalInt64NearestDelta(t *testing.T) {
 	// Verify encoding for monotonically incremented va.
 	v := int64(-35)
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		v += 8
 		va = append(va, v)
 	}
@@ -87,7 +87,7 @@ func TestMarshalUnmarshalInt64NearestDelta(t *testing.T) {
 	// Verify encoding for monotonically decremented va.
 	v = 793
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		v -= 16
 		va = append(va, v)
 	}
@@ -97,7 +97,7 @@ func TestMarshalUnmarshalInt64NearestDelta(t *testing.T) {
 	// Verify encoding for quadratically incremented va.
 	v = -1234567
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for i := range 1024 {
 		v += 32 + int64(i)
 		va = append(va, v)
 	}
@@ -106,7 +106,7 @@ func TestMarshalUnmarshalInt64NearestDelta(t *testing.T) {
 	// Verify encoding for decremented va with norm-float noise.
 	v = 787933
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		v -= 25 + int64(r.NormFloat64()*2)
 		va = append(va, v)
 	}
@@ -115,7 +115,7 @@ func TestMarshalUnmarshalInt64NearestDelta(t *testing.T) {
 	// Verify encoding for incremented va with random noise.
 	v = 943854
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		v += 30 + r.Int63n(5)
 		va = append(va, v)
 	}
@@ -124,7 +124,7 @@ func TestMarshalUnmarshalInt64NearestDelta(t *testing.T) {
 	// Verify encoding for constant va with norm-float noise.
 	v = -12345
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		v += int64(r.NormFloat64() * 10)
 		va = append(va, v)
 	}
@@ -133,7 +133,7 @@ func TestMarshalUnmarshalInt64NearestDelta(t *testing.T) {
 	// Verify encoding for constant va with random noise.
 	v = -12345
 	va = []int64{}
-	for i := 0; i < 1024; i++ {
+	for range 1024 {
 		v += r.Int63n(15) - 1
 		va = append(va, v)
 	}
diff --git a/lib/encoding/zstd/zstd_test.go b/lib/encoding/zstd/zstd_test.go
index 2ea216faa8..3d36ed0d9f 100644
--- a/lib/encoding/zstd/zstd_test.go
+++ b/lib/encoding/zstd/zstd_test.go
@@ -79,7 +79,7 @@ func TestCompressDecompress(t *testing.T) {
 
 	r := rand.New(rand.NewSource(1))
 	var b []byte
-	for i := 0; i < 64*1024; i++ {
+	for range 64 * 1024 {
 		b = append(b, byte(r.Int31n(256)))
 	}
 	testCrossCompressDecompress(t, b)