diff --git a/accounts/abi/abifuzzer_test.go b/accounts/abi/abifuzzer_test.go
index c37b4995c3..4b67947815 100644
--- a/accounts/abi/abifuzzer_test.go
+++ b/accounts/abi/abifuzzer_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/gofuzz"
+	fuzz "github.com/google/gofuzz"
 )
 
 // TestReplicate can be used to replicate crashers from the fuzzing tests.
@@ -163,7 +163,7 @@ func upTo(fuzzer *fuzz.Fuzzer, max int) int {
 	if i < 0 {
 		return (-1 - i) % max
 	}
-	return int(i) % max
+	return i % max
 }
 
 func oneOf(fuzzer *fuzz.Fuzzer, options []string) string {
diff --git a/core/vm/contracts_fuzz_test.go b/core/vm/contracts_fuzz_test.go
index 1e027371a6..b8b4bdcb6a 100644
--- a/core/vm/contracts_fuzz_test.go
+++ b/core/vm/contracts_fuzz_test.go
@@ -55,7 +55,7 @@ func FuzzPrecompiledContracts(f *testing.F) {
 		addrs = append(addrs, k)
 	}
 	f.Fuzz(func(t *testing.T, addr uint8, input []byte) {
-		a := addrs[int(int(addr)%len(addrs))]
+		a := addrs[int(addr)%len(addrs)]
 		p := allPrecompiles[a]
 		gas := p.RequiredGas(input)
 		if gas > 10_000_000 {