diff --git a/cmd/synapse-backupper/run_test.go b/cmd/synapse-backupper/run_test.go
index 62bd256..f2a887e 100644
--- a/cmd/synapse-backupper/run_test.go
+++ b/cmd/synapse-backupper/run_test.go
@@ -158,7 +158,7 @@ func TestRunCmd_SIGTERM_forcesExitAfterTimeout(t *testing.T) {
 		return fake, nil
 	}
 
-	newHealthz = func(port int) (*healthz.Server, error) {
+	newHealthz = func(port int) (healthz.Server, error) {
 		return healthz.New(port)
 	}
 
@@ -245,7 +245,7 @@ func TestRunCmd_Healthz503DuringShutdown(t *testing.T) {
 		t.Fatalf("failed to create healthz server: %v", err)
 	}
 
-	newHealthz = func(port int) (*healthz.Server, error) {
+	newHealthz = func(port int) (healthz.Server, error) {
 		return srv, nil
 	}
 
@@ -292,7 +292,7 @@ func TestRunCmd_Healthz503DuringShutdown(t *testing.T) {
 	cancel()
 
 	var status503 bool
-	for i := 0; i < 20; i++ {
+	for iteration := 0; iteration < 20; iteration++ {
 		resp, err = http.Get("http://" + addr + "/healthz")
 		if err == nil {
 			resp.Body.Close()
@@ -340,7 +340,7 @@ func TestRunCmd_HealthzBindFailure(t *testing.T) {
 		return fake, nil
 	}
 
-	newHealthz = func(port int) (*healthz.Server, error) {
+	newHealthz = func(port int) (healthz.Server, error) {
 		return nil, errors.New("bind failed")
 	}
 
diff --git a/pkg/adapters/crypto/x25519/x25519_test.go b/pkg/adapters/crypto/x25519/x25519_test.go
index 4fac655..cf35837 100644
--- a/pkg/adapters/crypto/x25519/x25519_test.go
+++ b/pkg/adapters/crypto/x25519/x25519_test.go
@@ -114,24 +114,24 @@ func TestRoundTrip(t *testing.T) {
 func TestRoundTripMany(t *testing.T) {
 	adapter := New()
 
-	for i := 0; i < 1000; i++ {
+	for iteration := 0; iteration < 1000; iteration++ {
 		pub, priv, err := adapter.GenerateKeyPair(rand.Reader)
 		if err != nil {
-			t.Fatalf("iteration %d: GenerateKeyPair failed: %v", i, err)
+			t.Fatalf("iteration %d: GenerateKeyPair failed: %v", iteration, err)
 		}
 
 		ct, ssEnc, err := adapter.Encapsulate(pub, rand.Reader)
 		if err != nil {
-			t.Fatalf("iteration %d: Encapsulate failed: %v", i, err)
+			t.Fatalf("iteration %d: Encapsulate failed: %v", iteration, err)
 		}
 
 		ssDec, err := adapter.Decapsulate(priv, ct)
 		if err != nil {
-			t.Fatalf("iteration %d: Decapsulate failed: %v", i, err)
+			t.Fatalf("iteration %d: Decapsulate failed: %v", iteration, err)
 		}
 
 		if !bytes.Equal(ssEnc, ssDec) {
-			t.Fatalf("iteration %d: shared secret mismatch", i)
+			t.Fatalf("iteration %d: shared secret mismatch", iteration)
 		}
 	}
 }