diff --git a/fragment_internal_test.go b/fragment_internal_test.go
index 2820ec57b..a878091b7 100644
--- a/fragment_internal_test.go
+++ b/fragment_internal_test.go
@@ -5378,7 +5378,7 @@ func TestFragmentConcurrentReadWrite(t *testing.T) {
 		ltx := idx.holder.txf.NewTx(Txo{Write: writable, Index: idx, Fragment: f, Shard: f.shard})
 
 		for i := uint64(0); i < 1000; i++ {
-			_, err := f.setBit(tx, i%4, i)
+			_, err := f.setBit(ltx, i%4, i)
 			if err != nil {
 				return errors.Wrap(err, "setting bit")
 			}
@@ -5388,12 +5388,12 @@ func TestFragmentConcurrentReadWrite(t *testing.T) {
 	})
 
 	// need read-only Tx so as not to block on the writer finishing above.
-	tx = idx.holder.txf.NewTx(Txo{Write: !writable, Index: idx, Fragment: f, Shard: f.shard})
-	defer tx.Rollback()
+	tx1 := idx.holder.txf.NewTx(Txo{Write: !writable, Index: idx, Fragment: f, Shard: f.shard})
+	defer tx1.Rollback()
 
 	acc := uint64(0)
 	for i := uint64(0); i < 100; i++ {
-		r := f.mustRow(tx, i%4)
+		r := f.mustRow(tx1, i%4)
 		acc += r.Count()
 	}
 	if err := eg.Wait(); err != nil {
diff --git a/main_test.go b/main_test.go
index 90f3cf214..73254f4e8 100644
--- a/main_test.go
+++ b/main_test.go
@@ -17,9 +17,9 @@ package pilosa_test
 import (
 	"fmt"
 	"net"
-	"net/http"
 	"testing"
 
+	"net/http"
 	_ "net/http/pprof"
 
 	"github.com/molecula/featurebase/v2/testhook"
diff --git a/server/handler_test.go b/server/handler_test.go
index da64d0004..25fe90c99 100644
--- a/server/handler_test.go
+++ b/server/handler_test.go
@@ -1104,8 +1104,8 @@ func TestHandler_Endpoints(t *testing.T) {
 		clus := test.MustRunCluster(t, 1, []server.CommandOption{test.OptAllowedOrigins([]string{"http://test/"})})
 		defer clus.Close()
 		w = httptest.NewRecorder()
-		h = clus.GetNode(0).Handler.(*http.Handler).Handler
-		h.ServeHTTP(w, req)
+		h1 := clus.GetNode(0).Handler.(*http.Handler).Handler
+		h1.ServeHTTP(w, req)
 		result = w.Result()
 
 		if result.StatusCode != 200 {