diff --git a/data/builder/dir_test.go b/data/builder/dir_test.go
index 8757f35..85eda58 100644
--- a/data/builder/dir_test.go
+++ b/data/builder/dir_test.go
@@ -21,7 +21,7 @@ import (
 
 func mkEntries(cnt int, ls *ipld.LinkSystem) ([]dagpb.PBLink, error) {
 	entries := make([]dagpb.PBLink, 0, cnt)
-	for i := 0; i < cnt; i++ {
+	for i := range cnt {
 		r := bytes.NewBufferString(fmt.Sprintf("%d", i))
 		e, err := mkEntry(r, fmt.Sprintf("file %d", i), ls)
 		if err != nil {
@@ -189,7 +189,7 @@ func TestBuildUnixFSRecursiveLargeSharded(t *testing.T) {
 		make([]fentry, 0),
 	}
 
-	for i := 0; i < 1344; i++ {
+	for i := range 1344 {
 		name := fmt.Sprintf("long name to fill out bytes to make the sharded directory test flip over the sharded directory limit because link names are included in the directory entry %d", i)
 		fixture.children = append(fixture.children, fentry{name, name, cid.Undef, nil})
 	}
@@ -220,7 +220,7 @@ func TestBuildUnixFSRecursiveLargeUnsharded(t *testing.T) {
 		make([]fentry, 0),
 	}
 
-	for i := 0; i < 1343; i++ {
+	for i := range 1343 {
 		name := fmt.Sprintf("long name to fill out bytes to make the sharded directory test flip over the sharded directory limit because link names are included in the directory entry %d", i)
 		fixture.children = append(fixture.children, fentry{name, name, cid.Undef, nil})
 	}
diff --git a/hamt/shardeddir_test.go b/hamt/shardeddir_test.go
index 67588b6..e030cd2 100644
--- a/hamt/shardeddir_test.go
+++ b/hamt/shardeddir_test.go
@@ -32,7 +32,7 @@ import (
 // in go-ipld-prime
 func shuffle(seed int64, arr []string) {
 	r := rand.New(rand.NewSource(seed))
-	for i := 0; i < len(arr); i++ {
+	for range arr {
 		a := r.Intn(len(arr))
 		b := r.Intn(len(arr))
 		arr[a], arr[b] = arr[b], arr[a]
@@ -52,7 +52,7 @@ func makeDirWidth(ds format.DAGService, size, width int) ([]string, *legacy.Shar
 	}
 
 	var dirs []string
-	for i := 0; i < size; i++ {
+	for i := range size {
 		dirs = append(dirs, fmt.Sprintf("DIRNAME%d", i))
 	}
 
@@ -209,7 +209,7 @@ func TestFindNonExisting(t *testing.T) {
 	require.NoError(t, err)
 	hamtShard, err := hamt.AttemptHAMTShardFromNode(ctx, nd, lsys)
 	require.NoError(t, err)
-	for i := 0; i < 200; i++ {
+	for i := range 200 {
 		key := fmt.Sprintf("notfound%d", i)
 		_, err := hamtShard.LookupByString(key)
 		require.EqualError(t, err, schema.ErrNoSuchField{Field: ipld.PathSegmentOfString(key)}.Error())
diff --git a/hamt/util_test.go b/hamt/util_test.go
index a31d7b3..3d28156 100644
--- a/hamt/util_test.go
+++ b/hamt/util_test.go
@@ -21,7 +21,7 @@ func TestHashBitsOverflow(t *testing.T) {
 	buf := []byte{255}
 	hb := hashBits{b: buf}
 
-	for i := 0; i < 8; i++ {
+	for i := range 8 {
 		bit, err := hb.Next(1)
 		if err != nil {
 			t.Fatalf("got %d bits back, expected 8: %s", i, err)
diff --git a/testutil/generator.go b/testutil/generator.go
index 5d6f87c..1cc1ca6 100644
--- a/testutil/generator.go
+++ b/testutil/generator.go
@@ -171,10 +171,7 @@ func UnixFSDirectory(lsys linking.LinkSystem, targetSize int, opts ...Option) (D
 					if err != nil {
 						return nil, err
 					}
-					size = int(sizeB.Int64())
-					if size > targetSize-curSize {
-						size = targetSize - curSize
-					}
+					size = min(int(sizeB.Int64()), targetSize-curSize)
 				}
 				entry, err := UnixFSFile(lsys, size, opts...)
 				if err != nil {
@@ -299,10 +296,7 @@ func GenerateDirectoryFrom(
 			for size == 0 { // don't make empty files
 				sizeB, err := rand.Int(randReader, big.NewInt(int64(targetFileSize)))
 				require.NoError(t, err)
-				size = int(sizeB.Int64())
-				if size > targetSize-curSize {
-					size = targetSize - curSize
-				}
+				size = min(int(sizeB.Int64()), targetSize-curSize)
 			}
 			entry := GenerateFile(t, linkSys, randReader, size)
 			var name string