diff --git a/backend/rates/history_test.go b/backend/rates/history_test.go
index 39757d98e0..9d446f746c 100644
--- a/backend/rates/history_test.go
+++ b/backend/rates/history_test.go
@@ -230,8 +230,8 @@ func BenchmarkDumpHistoryBucket(b *testing.B) {
 	}
 	updater := NewRateUpdater(nil, test.TstTempDir("BenchmarkDumpHistoryBucket"))
 	defer updater.Stop()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+
+	for b.Loop() {
 		err := updater.dumpHistoryBucket("btcUSD", rates)
 		require.NoError(b, err, "updater.dumpHistoryBucket")
 	}
@@ -252,8 +252,8 @@ func BenchmarkLoadHistoryBucket(b *testing.B) {
 
 	updater2 := NewRateUpdater(nil, dbdir)
 	defer updater2.Stop()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+
+	for b.Loop() {
 		rates, err := updater2.loadHistoryBucket("btcUSD")
 		require.NoError(b, err, "updater.loadHistoryBucket")
 		require.Len(b, rates, 5000, "len(rates)")