diff --git a/server/cluster_test.go b/server/cluster_test.go
index d788de803..744b63dcb 100644
--- a/server/cluster_test.go
+++ b/server/cluster_test.go
@@ -143,9 +143,9 @@ func TestClusterResize_AddNode(t *testing.T) {
 		clus := test.MustRunCluster(t, 2)
 		defer clus.Close()
 
-		if !checkClusterState(clus[0], pilosa.ClusterStateNormal, 1000) {
+		if !test.CheckClusterState(clus[0], pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node0 cluster state: %s", clus[0].API.State())
-		} else if !checkClusterState(clus[1], pilosa.ClusterStateNormal, 1000) {
+		} else if !test.CheckClusterState(clus[1], pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node1 cluster state: %s", clus[1].API.State())
 		}
 	})
@@ -176,9 +176,9 @@ func TestClusterResize_AddNode(t *testing.T) {
 		}
 		defer m1.Close()
 
-		if !checkClusterState(m0, pilosa.ClusterStateNormal, 1000) {
+		if !test.CheckClusterState(m0, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node0 cluster state: %s", m0.API.State())
-		} else if !checkClusterState(m1, pilosa.ClusterStateNormal, 1000) {
+		} else if !test.CheckClusterState(m1, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node1 cluster state: %s", m1.API.State())
 		}
 	})
@@ -224,9 +224,9 @@ func TestClusterResize_AddNode(t *testing.T) {
 		}
 		defer m1.Close()
 
-		if !checkClusterState(m0, pilosa.ClusterStateNormal, 1000) {
+		if !test.CheckClusterState(m0, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node0 cluster state: %s", m0.API.State())
-		} else if !checkClusterState(m1, pilosa.ClusterStateNormal, 1000) {
+		} else if !test.CheckClusterState(m1, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node1 cluster state: %s", m1.API.State())
 		}
 
@@ -273,9 +273,9 @@ func TestClusterResize_AddNode(t *testing.T) {
 		}
 		defer m1.Close()
 
-		if !checkClusterState(m0, pilosa.ClusterStateNormal, 1000) {
+		if !test.CheckClusterState(m0, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node0 cluster state: %s", m0.API.State())
-		} else if !checkClusterState(m1, pilosa.ClusterStateNormal, 1000) {
+		} else if !test.CheckClusterState(m1, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node1 cluster state: %s", m1.API.State())
 		}
 
@@ -326,9 +326,9 @@ func TestClusterResize_AddNode(t *testing.T) {
 		}
 		defer m1.Close()
 
-		if !checkClusterState(m0, pilosa.ClusterStateNormal, 1000) {
+		if !test.CheckClusterState(m0, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node0 cluster state: %s", m0.API.State())
-		} else if !checkClusterState(m1, pilosa.ClusterStateNormal, 1000) {
+		} else if !test.CheckClusterState(m1, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node1 cluster state: %s", m1.API.State())
 		}
 
@@ -373,9 +373,9 @@ func TestClusterResize_AddNodeConcurrentIndex(t *testing.T) {
 		}
 		defer m1.Close()
 
-		if !checkClusterState(m0, pilosa.ClusterStateNormal, 1000) {
+		if !test.CheckClusterState(m0, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node0 cluster state: %s", m0.API.State())
-		} else if !checkClusterState(m1, pilosa.ClusterStateNormal, 1000) {
+		} else if !test.CheckClusterState(m1, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node1 cluster state: %s", m1.API.State())
 		}
 
@@ -431,9 +431,9 @@ func TestClusterResize_AddNodeConcurrentIndex(t *testing.T) {
 		}()
 		defer m1.Close()
 
-		if !checkClusterState(m0, pilosa.ClusterStateNormal, 1000) {
+		if !test.CheckClusterState(m0, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node0 cluster state: %s", m0.API.State())
-		} else if !checkClusterState(m1, pilosa.ClusterStateNormal, 1000) {
+		} else if !test.CheckClusterState(m1, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node1 cluster state: %s", m1.API.State())
 		}
 
@@ -489,9 +489,9 @@ func TestClusterResize_AddNodeConcurrentIndex(t *testing.T) {
 		}
 		defer m1.Close()
 
-		if !checkClusterState(m0, pilosa.ClusterStateNormal, 1000) {
+		if !test.CheckClusterState(m0, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node0 cluster state: %s", m0.API.State())
-		} else if !checkClusterState(m1, pilosa.ClusterStateNormal, 1000) {
+		} else if !test.CheckClusterState(m1, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node1 cluster state: %s", m1.API.State())
 		}
 
@@ -545,9 +545,9 @@ func TestClusterResize_AddNodeConcurrentIndex(t *testing.T) {
 		}
 		defer m1.Close()
 
-		if !checkClusterState(m0, pilosa.ClusterStateNormal, 1000) {
+		if !test.CheckClusterState(m0, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node0 cluster state: %s", m0.API.State())
-		} else if !checkClusterState(m1, pilosa.ClusterStateNormal, 1000) {
+		} else if !test.CheckClusterState(m1, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node1 cluster state: %s", m1.API.State())
 		}
 		m0.QueryExpect(t, "i", "", `Row(f=1)`, exp)
@@ -598,11 +598,11 @@ func TestCluster_GossipMembership(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		if !checkClusterState(m0, pilosa.ClusterStateNormal, 1000) {
+		if !test.CheckClusterState(m0, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node0 cluster state: %s", m0.API.State())
-		} else if !checkClusterState(m1, pilosa.ClusterStateNormal, 1000) {
+		} else if !test.CheckClusterState(m1, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node1 cluster state: %s", m1.API.State())
-		} else if !checkClusterState(m2, pilosa.ClusterStateNormal, 1000) {
+		} else if !test.CheckClusterState(m2, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node2 cluster state: %s", m2.API.State())
 		}
 
@@ -725,15 +725,3 @@ func TestClusterMutualTLS(t *testing.T) {
 		t.Fatal(err)
 	}
 }
-
-// checkClusterState polls a given cluster for its state until it
-// receives a matching state. It polls up to n times before returning.
-func checkClusterState(m *test.Command, state string, n int) bool {
-	for i := 0; i < n; i++ {
-		if m.API.State() == state {
-			return true
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	return false
-}
diff --git a/test/cluster.go b/test/cluster.go
index babb3890f..4fbc2050e 100644
--- a/test/cluster.go
+++ b/test/cluster.go
@@ -193,6 +193,18 @@ func MustNewCluster(tb testing.TB, size int, opts ...[]server.CommandOption) Clu
 	return c
 }
 
+// CheckClusterState polls a given cluster for its state until it
+// receives a matching state. It polls up to n times before returning.
+func CheckClusterState(m *Command, state string, n int) bool {
+	for i := 0; i < n; i++ {
+		if m.API.State() == state {
+			return true
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+	return false
+}
+
 // newCluster creates a new cluster
 func newCluster(tb testing.TB, size int, opts ...[]server.CommandOption) (Cluster, error) {
 	if size == 0 {
diff --git a/translator_test.go b/translator_test.go
index 8808add64..0acce9b66 100644
--- a/translator_test.go
+++ b/translator_test.go
@@ -22,7 +22,6 @@ import (
 	"io"
 	"reflect"
 	"testing"
-	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/pilosa/pilosa/v2"
@@ -354,9 +353,9 @@ func TestTranslation_Replication(t *testing.T) {
 
 		exp := `{"results":[{"attrs":{},"columns":[],"keys":["x1","x2"]}]}`
 
-		if !checkClusterState(node0, pilosa.ClusterStateNormal, 1000) {
+		if !test.CheckClusterState(node0, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node0 cluster state: %s", node0.API.State())
-		} else if !checkClusterState(node1, pilosa.ClusterStateNormal, 1000) {
+		} else if !test.CheckClusterState(node1, pilosa.ClusterStateNormal, 1000) {
 			t.Fatalf("unexpected node1 cluster state: %s", node1.API.State())
 		}
 
@@ -373,18 +372,6 @@ func TestTranslation_Replication(t *testing.T) {
 	})
 }
 
-// checkClusterState polls a given cluster for its state until it
-// receives a matching state. It polls up to n times before returning.
-func checkClusterState(m *test.Command, state string, n int) bool {
-	for i := 0; i < n; i++ {
-		if m.API.State() == state {
-			return true
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	return false
-}
-
 // Test key translation with multiple nodes.
 func TestTranslation_Coordinator(t *testing.T) {
 	// Ensure that field key translations requests sent to