diff --git a/rpc/client_test.go b/rpc/client_test.go
index 03a3410537..d97335e343 100644
--- a/rpc/client_test.go
+++ b/rpc/client_test.go
@@ -529,7 +529,7 @@ func TestClientCloseUnsubscribeRace(t *testing.T) {
 	server := newTestServer()
 	defer server.Stop()
 
-	for i := 0; i < 20; i++ {
+	for range 20 {
 		client := DialInProc(server)
 		nc := make(chan int)
 		sub, err := client.Subscribe(context.Background(), "nftest", nc, "someSubscription", 3, 1)
@@ -690,7 +690,7 @@ func TestClientSubscriptionChannelClose(t *testing.T) {
 	client, _ := Dial(wsURL)
 	defer client.Close()
 
-	for i := 0; i < 100; i++ {
+	for range 100 {
 		ch := make(chan int, 100)
 		sub, err := client.Subscribe(context.Background(), "nftest", ch, "someSubscription", 100, 1)
 		if err != nil {
diff --git a/rpc/server_test.go b/rpc/server_test.go
index 8334d4e80d..e7f94345c1 100644
--- a/rpc/server_test.go
+++ b/rpc/server_test.go
@@ -144,7 +144,7 @@ func TestServerShortLivedConn(t *testing.T) {
 		wantResp = `{"jsonrpc":"2.0","id":1,"result":{"nftest":"1.0","rpc":"1.0","test":"1.0"}}` + "\n"
 		deadline = time.Now().Add(10 * time.Second)
 	)
-	for i := 0; i < 20; i++ {
+	for range 20 {
 		conn, err := net.Dial("tcp", listener.Addr().String())
 		if err != nil {
 			t.Fatal("can't dial:", err)
@@ -178,7 +178,7 @@ func TestServerBatchResponseSizeLimit(t *testing.T) {
 		batch  []BatchElem
 		client = DialInProc(server)
 	)
-	for i := 0; i < 5; i++ {
+	for range 5 {
 		batch = append(batch, BatchElem{
 			Method: "test_echo",
 			Args:   []any{"x", 1},