diff --git a/cli/command/container/run_test.go b/cli/command/container/run_test.go
index c0049e8b45..8cc0b1bdc1 100644
--- a/cli/command/container/run_test.go
+++ b/cli/command/container/run_test.go
@@ -247,7 +247,7 @@ func TestRunPullTermination(t *testing.T) {
 			go func() {
 				id := test.RandomID()[:12] // short-ID
 				progressOutput := streamformatter.NewJSONProgressOutput(server, true)
-				for i := 0; i < 100; i++ {
+				for i := range 100 {
 					select {
 					case <-ctx.Done():
 						assert.NilError(t, server.Close(), "failed to close imageCreateFunc server")
diff --git a/cli/command/container/tty.go b/cli/command/container/tty.go
index 6d57bf0e34..89352f7898 100644
--- a/cli/command/container/tty.go
+++ b/cli/command/container/tty.go
@@ -60,7 +60,7 @@ func initTtySize(ctx context.Context, cli command.Cli, id string, isExec bool, r
 	if err := rTTYfunc(ctx, cli, id, isExec); err != nil {
 		go func() {
 			var err error
-			for retry := 0; retry < 10; retry++ {
+			for retry := range 10 {
 				time.Sleep(time.Duration(retry+1) * 10 * time.Millisecond)
 				if err = rTTYfunc(ctx, cli, id, isExec); err == nil {
 					break
diff --git a/cli/command/formatter/tabwriter/tabwriter_test.go b/cli/command/formatter/tabwriter/tabwriter_test.go
index 5f61d87aae..c9fcaf4d3e 100644
--- a/cli/command/formatter/tabwriter/tabwriter_test.go
+++ b/cli/command/formatter/tabwriter/tabwriter_test.go
@@ -25,7 +25,7 @@ func (b *buffer) Write(buf []byte) (written int, err error) {
 	m := len(buf)
 	if n+m <= cap(b.a) {
 		b.a = b.a[0 : n+m]
-		for i := 0; i < m; i++ {
+		for i := range m {
 			b.a[n+i] = buf[i]
 		}
 	} else {
@@ -669,7 +669,7 @@ func BenchmarkTable(b *testing.B) {
 					for i := 0; i < b.N; i++ {
 						w := NewWriter(io.Discard, 4, 4, 1, ' ', 0) // no particular reason for these settings
 						// Write the line h times.
-						for j := 0; j < h; j++ {
+						for range h {
 							w.Write(line)
 						}
 						w.Flush()
@@ -681,7 +681,7 @@ func BenchmarkTable(b *testing.B) {
 					w := NewWriter(io.Discard, 4, 4, 1, ' ', 0) // no particular reason for these settings
 					for i := 0; i < b.N; i++ {
 						// Write the line h times.
-						for j := 0; j < h; j++ {
+						for range h {
 							w.Write(line)
 						}
 						w.Flush()
@@ -701,7 +701,7 @@ func BenchmarkPyramid(b *testing.B) {
 			for i := 0; i < b.N; i++ {
 				w := NewWriter(io.Discard, 4, 4, 1, ' ', 0) // no particular reason for these settings
 				// Write increasing prefixes of that line.
-				for j := 0; j < x; j++ {
+				for j := range x {
 					w.Write(line[:j*2])
 					w.Write([]byte{'\n'})
 				}
@@ -723,7 +723,7 @@ func BenchmarkRagged(b *testing.B) {
 			for i := 0; i < b.N; i++ {
 				w := NewWriter(io.Discard, 4, 4, 1, ' ', 0) // no particular reason for these settings
 				// Write the lines in turn h times.
-				for j := 0; j < h; j++ {
+				for j := range h {
 					w.Write(lines[j%len(lines)])
 					w.Write([]byte{'\n'})
 				}
diff --git a/cli/command/idresolver/idresolver_test.go b/cli/command/idresolver/idresolver_test.go
index 120d7a8fb2..62289d71e1 100644
--- a/cli/command/idresolver/idresolver_test.go
+++ b/cli/command/idresolver/idresolver_test.go
@@ -60,7 +60,7 @@ func TestResolveWithCache(t *testing.T) {
 	idResolver := New(apiClient, false)
 
 	ctx := context.Background()
-	for i := 0; i < 2; i++ {
+	for range 2 {
 		id, err := idResolver.Resolve(ctx, swarm.Node{}, "nodeID")
 		assert.NilError(t, err)
 		assert.Check(t, is.Equal("node-foo", id))
diff --git a/cli/command/service/list_test.go b/cli/command/service/list_test.go
index be60eb4f77..8d6462e0bd 100644
--- a/cli/command/service/list_test.go
+++ b/cli/command/service/list_test.go
@@ -279,7 +279,7 @@ func generateNodes(t *testing.T, activeNodes uint64) client.NodeListResult {
 	t.Helper()
 	nodes := client.NodeListResult{}
 	var i uint64
-	for i = 0; i < activeNodes; i++ {
+	for i = range activeNodes {
 		nodes.Items = append(nodes.Items, swarm.Node{
 			ID:     fmt.Sprintf("node-ready-%d", i),
 			Status: swarm.NodeStatus{State: swarm.NodeStateReady},
diff --git a/cli/command/service/progress/progress_test.go b/cli/command/service/progress/progress_test.go
index 7cd7664e35..68c77979bc 100644
--- a/cli/command/service/progress/progress_test.go
+++ b/cli/command/service/progress/progress_test.go
@@ -856,7 +856,7 @@ func TestGlobalJobProgressUpdaterLarge(t *testing.T) {
 	}
 
 	activeNodes := map[string]struct{}{}
-	for i := 0; i < 50; i++ {
+	for i := range 50 {
 		activeNodes[fmt.Sprintf("node%v", i)] = struct{}{}
 	}
 
diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go
index 5450ea05ec..72347b9517 100644
--- a/cmd/docker/docker.go
+++ b/cmd/docker/docker.go
@@ -410,7 +410,7 @@ func forceExitAfter3TerminationSignals(ctx context.Context, streams command.Stre
 	signal.Notify(sig, platformsignals.TerminationSignals...)
 
 	// once we have received a total of 3 signals we force exit the cli
-	for i := 0; i < 2; i++ {
+	for range 2 {
 		<-sig
 	}
 	_, _ = fmt.Fprint(streams.Err(), "\ngot 3 SIGTERM/SIGINTs, forcefully exiting\n")
diff --git a/internal/jsonstream/display_test.go b/internal/jsonstream/display_test.go
index 17f3ac2f37..b40679422a 100644
--- a/internal/jsonstream/display_test.go
+++ b/internal/jsonstream/display_test.go
@@ -25,7 +25,7 @@ func TestDisplay(t *testing.T) {
 	go func() {
 		id := test.RandomID()[:12] // short-ID
 		progressOutput := streamformatter.NewJSONProgressOutput(server, true)
-		for i := 0; i < 100; i++ {
+		for i := range 100 {
 			select {
 			case <-ctx.Done():
 				assert.NilError(t, server.Close(), "failed to close jsonmessage server")