diff --git a/core/bench_test.go b/core/bench_test.go
index 2830022662..9879f1d30f 100644
--- a/core/bench_test.go
+++ b/core/bench_test.go
@@ -301,7 +301,7 @@ func makeChainForBench(db ethdb.Database, genesis *Genesis, full bool, count uin
 
 func benchWriteChain(b *testing.B, full bool, count uint64) {
 	genesis := &Genesis{Config: params.AllEthashProtocolChanges}
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		pdb, err := pebble.New(b.TempDir(), 1024, 128, "", false)
 		if err != nil {
 			b.Fatalf("error opening database: %v", err)
@@ -327,8 +327,7 @@ func benchReadChain(b *testing.B, full bool, count uint64) {
 	options := DefaultConfig().WithArchive(true)
 	b.ReportAllocs()
 	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		pdb, err = pebble.New(dir, 1024, 128, "", false)
 		if err != nil {
 			b.Fatalf("error opening database: %v", err)
diff --git a/core/rlp_test.go b/core/rlp_test.go
index bc37408537..9304fafcc6 100644
--- a/core/rlp_test.go
+++ b/core/rlp_test.go
@@ -150,7 +150,7 @@ func BenchmarkHashing(b *testing.B) {
 	var hasher = sha3.NewLegacyKeccak256()
 	b.Run("iteratorhashing", func(b *testing.B) {
 		b.ResetTimer()
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			var hash common.Hash
 			it, err := rlp.NewListIterator(bodyRlp)
 			if err != nil {
@@ -173,7 +173,7 @@ func BenchmarkHashing(b *testing.B) {
 	var exp common.Hash
 	b.Run("fullbodyhashing", func(b *testing.B) {
 		b.ResetTimer()
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			var body types.Body
 			rlp.DecodeBytes(bodyRlp, &body)
 			for _, tx := range body.Transactions {
@@ -183,7 +183,7 @@ func BenchmarkHashing(b *testing.B) {
 	})
 	b.Run("fullblockhashing", func(b *testing.B) {
 		b.ResetTimer()
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			var block types.Block
 			rlp.DecodeBytes(blockRlp, &block)
 			for _, tx := range block.Transactions() {