diff --git a/ctl/backup_tar_test.go b/ctl/backup_tar_test.go
index 95a3b0ccd..db8e88032 100644
--- a/ctl/backup_tar_test.go
+++ b/ctl/backup_tar_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/featurebasedb/featurebase/v3/logger"
+	pilosa "github.com/featurebasedb/featurebase/v3"
 	"github.com/featurebasedb/featurebase/v3/test"
 )
 
diff --git a/executor_test.go b/executor_test.go
index 33ea09ad9..b489c6738 100644
--- a/executor_test.go
+++ b/executor_test.go
@@ -33,16 +33,7 @@ import (
 	"github.com/featurebasedb/featurebase/v3/testhook"
 	. "github.com/featurebasedb/featurebase/v3/vprint" // nolint:staticcheck
 	"github.com/google/go-cmp/cmp"
-	pilosa "github.com/featurebasedb/featurebase/v3"
-	"github.com/featurebasedb/featurebase/v3/ctl"
-	"github.com/featurebasedb/featurebase/v3/disco"
 	"github.com/featurebasedb/featurebase/v3/logger"
-	"github.com/featurebasedb/featurebase/v3/pql"
-	"github.com/featurebasedb/featurebase/v3/proto"
-	"github.com/featurebasedb/featurebase/v3/server"
-	"github.com/featurebasedb/featurebase/v3/test"
-	"github.com/featurebasedb/featurebase/v3/testhook"
-	. "github.com/featurebasedb/featurebase/v3/vprint" // nolint:staticcheck
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/idk/ingest_test.go b/idk/ingest_test.go
index a1875758f..7922b8c7a 100644
--- a/idk/ingest_test.go
+++ b/idk/ingest_test.go
@@ -20,14 +20,10 @@ import (
 	"github.com/featurebasedb/featurebase/v3/logger"
 	"github.com/golang-jwt/jwt"
 	pilosa "github.com/featurebasedb/featurebase/v3"
-	"github.com/featurebasedb/featurebase/v3/authn"
 	batch "github.com/featurebasedb/featurebase/v3/batch"
-	pilosaclient "github.com/featurebasedb/featurebase/v3/client"
 	"github.com/featurebasedb/featurebase/v3/dax"
 	mdsclient "github.com/featurebasedb/featurebase/v3/dax/mds/client"
-	"github.com/featurebasedb/featurebase/v3/idk/idktest"
 	"github.com/featurebasedb/featurebase/v3/idk/mds"
-	"github.com/featurebasedb/featurebase/v3/logger"
 	"github.com/featurebasedb/featurebase/v3/pql"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
diff --git a/sql3/sql_complex_test.go b/sql3/sql_complex_test.go
index 40e41b74d..38bd3dac4 100644
--- a/sql3/sql_complex_test.go
+++ b/sql3/sql_complex_test.go
@@ -11,12 +11,6 @@ import (
 	"testing"
 	"time"
 
-	pilosa "github.com/featurebasedb/featurebase/v3"
-	"github.com/featurebasedb/featurebase/v3/pql"
-	"github.com/featurebasedb/featurebase/v3/sql3/parser"
-	planner_types "github.com/featurebasedb/featurebase/v3/sql3/planner/types"
-	sql_test "github.com/featurebasedb/featurebase/v3/sql3/test"
-	"github.com/featurebasedb/featurebase/v3/test"
 	"github.com/google/go-cmp/cmp"
 	pilosa "github.com/featurebasedb/featurebase/v3"
 	"github.com/featurebasedb/featurebase/v3/dax"
@@ -24,7 +18,7 @@ import (
 	sql_test "github.com/featurebasedb/featurebase/v3/sql3/test"
 	"github.com/featurebasedb/featurebase/v3/test"
 	"github.com/stretchr/testify/assert"
-)
+	)
 
 func TestPlanner_Misc(t *testing.T) {
 	d, err := pql.ParseDecimal("12.345678")
diff --git a/translate_boltdb_test.go b/translate_boltdb_test.go
index 5ca264f50..4dc92b2e9 100644
--- a/translate_boltdb_test.go
+++ b/translate_boltdb_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/featurebasedb/featurebase/v3/disco"
 	"github.com/featurebasedb/featurebase/v3/roaring"
 	"github.com/featurebasedb/featurebase/v3/testhook"
+	"github.com/stretchr/testify/require"
 )
 
 //var vv = pilosa.VV
diff --git a/translator_test.go b/translator_test.go
index e568558ce..4e2255762 100644
--- a/translator_test.go
+++ b/translator_test.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	pilosa "github.com/featurebasedb/featurebase/v3"
-	"github.com/featurebasedb/featurebase/v3/disco"
 	"github.com/featurebasedb/featurebase/v3/mock"
 	"github.com/featurebasedb/featurebase/v3/test"
 	"github.com/google/go-cmp/cmp"