diff --git a/pkg/rnd/auth_test.go b/pkg/rnd/auth_test.go
index ab2661d52..bc05a3de4 100644
--- a/pkg/rnd/auth_test.go
+++ b/pkg/rnd/auth_test.go
@@ -20,7 +20,7 @@ func TestAuthToken(t *testing.T) {
 }
 
 func BenchmarkAuthToken(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		AuthToken()
 	}
 }
@@ -38,7 +38,7 @@ func TestIsAuthToken(t *testing.T) {
 }
 
 func BenchmarkIsAuthToken(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		IsAuthToken("69be27ac5ca305b394046a83f6fda18167ca3d3f2dbe7ac2")
 	}
 }
@@ -52,7 +52,7 @@ func TestAppPassword(t *testing.T) {
 }
 
 func BenchmarkAppPassword(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		AppPassword()
 	}
 }
@@ -93,13 +93,13 @@ func TestIsAppPasswordt(t *testing.T) {
 }
 
 func BenchmarkAppPasswordtVerifyChecksum(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		IsAppPassword("MPkOqm-RtKGOi-ctIvXm-Qv3XhN", true)
 	}
 }
 
 func BenchmarkAppPasswordIgnoreChecksum(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		IsAppPassword("MPkOqm-RtKGOi-ctIvXm-Qv3XhN", false)
 	}
 }
@@ -166,7 +166,7 @@ func TestIsAuthAny(t *testing.T) {
 }
 
 func BenchmarkIsAuthAny(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		IsAuthAny("MPkOqm-RtKGOi-ctIvXm-Qv3XhN")
 	}
 }
diff --git a/pkg/rnd/client_test.go b/pkg/rnd/client_test.go
index 852b83538..063faec97 100644
--- a/pkg/rnd/client_test.go
+++ b/pkg/rnd/client_test.go
@@ -22,7 +22,7 @@ func TestClientSecret(t *testing.T) {
 }
 
 func BenchmarkClientSecret(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		ClientSecret()
 	}
 }
@@ -42,7 +42,7 @@ func TestIsClientSecret(t *testing.T) {
 }
 
 func BenchmarkIsClientSecret(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		IsClientSecret("69be27ac5ca305b394046a83f6fda181")
 	}
 }
diff --git a/pkg/rnd/name_test.go b/pkg/rnd/name_test.go
index ba739dceb..ed8c26304 100644
--- a/pkg/rnd/name_test.go
+++ b/pkg/rnd/name_test.go
@@ -21,7 +21,7 @@ func TestName(t *testing.T) {
 }
 
 func BenchmarkName(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		Name()
 	}
 }
diff --git a/pkg/rnd/token_test.go b/pkg/rnd/token_test.go
index e898c7982..3beb1fb28 100644
--- a/pkg/rnd/token_test.go
+++ b/pkg/rnd/token_test.go
@@ -127,13 +127,13 @@ func TestRandomToken(t *testing.T) {
 }
 
 func BenchmarkGenerateToken4(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		Base36(4)
 	}
 }
 
 func BenchmarkGenerateToken3(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		Base36(3)
 	}
 }
diff --git a/pkg/rnd/uid_test.go b/pkg/rnd/uid_test.go
index fcf720478..fdaa5478b 100644
--- a/pkg/rnd/uid_test.go
+++ b/pkg/rnd/uid_test.go
@@ -80,7 +80,7 @@ func TestGenerateUID(t *testing.T) {
 }
 
 func BenchmarkGenerateUID(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		GenerateUID('x')
 	}
 }
diff --git a/pkg/rnd/uuid_test.go b/pkg/rnd/uuid_test.go
index 580e2bf0b..333fd4121 100644
--- a/pkg/rnd/uuid_test.go
+++ b/pkg/rnd/uuid_test.go
@@ -15,7 +15,7 @@ func TestUUID(t *testing.T) {
 }
 
 func BenchmarkUUID(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		UUID()
 	}
 }