diff --git a/backend/smb/filepool_test.go b/backend/smb/filepool_test.go
index 7cf90988b..019e688f4 100644
--- a/backend/smb/filepool_test.go
+++ b/backend/smb/filepool_test.go
@@ -200,7 +200,7 @@ func TestFilePool_ConcurrentAccess(t *testing.T) {
 	pool := newFilePool(ctx, fs, "testshare", "/test/path")
 
 	const numGoroutines = 10
-	for i := 0; i < numGoroutines; i++ {
+	for range numGoroutines {
 		mockFile := newMockFile()
 		pool.pool = append(pool.pool, mockFile)
 	}
@@ -208,7 +208,7 @@ func TestFilePool_ConcurrentAccess(t *testing.T) {
 	// Test concurrent get operations
 	done := make(chan bool, numGoroutines)
 
-	for i := 0; i < numGoroutines; i++ {
+	for range numGoroutines {
 		go func() {
 			defer func() { done <- true }()
 
@@ -219,7 +219,7 @@ func TestFilePool_ConcurrentAccess(t *testing.T) {
 		}()
 	}
 
-	for i := 0; i < numGoroutines; i++ {
+	for range numGoroutines {
 		<-done
 	}
 
diff --git a/cmd/convmv/convmv_test.go b/cmd/convmv/convmv_test.go
index 8e0ec4d5d..73fd45943 100644
--- a/cmd/convmv/convmv_test.go
+++ b/cmd/convmv/convmv_test.go
@@ -152,7 +152,7 @@ func makeTestFiles(t *testing.T, r *fstest.Run, dir string) []fstest.Item {
 	items := []fstest.Item{}
 	for _, c := range alphabet {
 		var out strings.Builder
-		for i := rune(0); i < 7; i++ {
+		for i := range rune(7) {
 			out.WriteRune(c + i)
 		}
 		fileName := path.Join(dir, fmt.Sprintf("%04d-%s.txt", n, out.String()))
diff --git a/cmd/test/info/base32768.go b/cmd/test/info/base32768.go
index 23949a2e1..dac3f3134 100644
--- a/cmd/test/info/base32768.go
+++ b/cmd/test/info/base32768.go
@@ -34,7 +34,7 @@ func (r *results) checkBase32768() {
 	// Create test files
 	for _, c := range safeAlphabet {
 		var out strings.Builder
-		for i := rune(0); i < 32; i++ {
+		for i := range rune(32) {
 			out.WriteRune(c + i)
 		}
 		fileName := filepath.Join(dir, fmt.Sprintf("%04d-%s.txt", n, out.String()))
diff --git a/cmd/test/info/info.go b/cmd/test/info/info.go
index 9f0b9be8d..0e709f09f 100644
--- a/cmd/test/info/info.go
+++ b/cmd/test/info/info.go
@@ -292,7 +292,7 @@ func (r *results) checkControls() {
 		tokens <- struct{}{}
 	}
 	var wg sync.WaitGroup
-	for i := rune(0); i < 128; i++ {
+	for i := range rune(128) {
 		s := string(i)
 		if i == 0 || i == '/' {
 			// We're not even going to check NULL or /
diff --git a/fs/list/helpers_test.go b/fs/list/helpers_test.go
index 8973b9ddd..412857c8f 100644
--- a/fs/list/helpers_test.go
+++ b/fs/list/helpers_test.go
@@ -62,7 +62,7 @@ func TestListRHelperSend(t *testing.T) {
 	helper := NewHelper(callback)
 
 	// Add 100 entries to force the callback to be invoked
-	for i := 0; i < 100; i++ {
+	for range 100 {
 		require.NoError(t, helper.Add(entry))
 	}
 
@@ -120,7 +120,7 @@ var _ fs.ListPer = (*mockListPfs)(nil)
 func TestListWithListP(t *testing.T) {
 	ctx := context.Background()
 	var entries fs.DirEntries
-	for i := 0; i < 26; i++ {
+	for i := range 26 {
 		entries = append(entries, mockobject.New(fmt.Sprintf("%c", 'A'+i)))
 	}
 	t.Run("NoError", func(t *testing.T) {
diff --git a/fs/list/sorter_test.go b/fs/list/sorter_test.go
index 7d34e0975..b8db3725e 100644
--- a/fs/list/sorter_test.go
+++ b/fs/list/sorter_test.go
@@ -144,7 +144,7 @@ func testSorterExt(t *testing.T, cutoff, N int, wantExtSort bool, keyFn KeyFn) {
 
 	// Make the directory entries
 	entriesMap := make(map[string]fs.DirEntry, N)
-	for i := 0; i < N; i++ {
+	for i := range N {
 		remote := fmt.Sprintf("%010d", i)
 		prefix := "a"
 		if i%3 == 0 {
diff --git a/fs/rc/jobs/job_test.go b/fs/rc/jobs/job_test.go
index f0799200c..de90e26a4 100644
--- a/fs/rc/jobs/job_test.go
+++ b/fs/rc/jobs/job_test.go
@@ -206,7 +206,7 @@ func TestJobRunPanic(t *testing.T) {
 	runtime.Gosched() // yield to make sure job is updated
 
 	// Wait a short time for the panic to propagate
-	for i := uint(0); i < 10; i++ {
+	for i := range uint(10) {
 		job.mu.Lock()
 		e := job.Error
 		job.mu.Unlock()
diff --git a/fs/sync/sync_transform_test.go b/fs/sync/sync_transform_test.go
index 8d0621095..d43594509 100644
--- a/fs/sync/sync_transform_test.go
+++ b/fs/sync/sync_transform_test.go
@@ -136,7 +136,7 @@ func makeTestFiles(t *testing.T, r *fstest.Run, dir string) []fstest.Item {
 	items := []fstest.Item{}
 	for _, c := range alphabet {
 		var out strings.Builder
-		for i := rune(0); i < 7; i++ {
+		for i := range rune(7) {
 			out.WriteRune(c + i)
 		}
 		fileName := path.Join(dir, fmt.Sprintf("%04d-%s.txt", n, out.String()))