diff --git a/client/alloc_runner_test.go b/client/alloc_runner_test.go
index 2f3462958..cfa0e530a 100644
--- a/client/alloc_runner_test.go
+++ b/client/alloc_runner_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/hashicorp/nomad/testutil"
 
-	clientTestUtil "github.com/hashicorp/nomad/client/testutil"
+	ctestutil "github.com/hashicorp/nomad/client/testutil"
 )
 
 type MockAllocStateUpdater struct {
@@ -34,7 +34,7 @@ func testAllocRunner() (*MockAllocStateUpdater, *AllocRunner) {
 }
 
 func TestAllocRunner_SimpleRun(t *testing.T) {
-	clientTestUtil.ExecCompatible(t)
+	ctestutil.ExecCompatible(t)
 	upd, ar := testAllocRunner()
 	go ar.Run()
 	defer ar.Destroy()
@@ -51,7 +51,7 @@ func TestAllocRunner_SimpleRun(t *testing.T) {
 }
 
 func TestAllocRunner_Destroy(t *testing.T) {
-	clientTestUtil.ExecCompatible(t)
+	ctestutil.ExecCompatible(t)
 	upd, ar := testAllocRunner()
 
 	// Ensure task takes some time
@@ -83,7 +83,7 @@ func TestAllocRunner_Destroy(t *testing.T) {
 }
 
 func TestAllocRunner_Update(t *testing.T) {
-	clientTestUtil.ExecCompatible(t)
+	ctestutil.ExecCompatible(t)
 	upd, ar := testAllocRunner()
 
 	// Ensure task takes some time
diff --git a/client/client_test.go b/client/client_test.go
index 98a36c7f3..62689f975 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/hashicorp/nomad/testutil"
 
-	clientTestUtil "github.com/hashicorp/nomad/client/testutil"
+	ctestutil "github.com/hashicorp/nomad/client/testutil"
 )
 
 var nextPort uint32 = 16000
@@ -139,7 +139,7 @@ func TestClient_Fingerprint(t *testing.T) {
 }
 
 func TestClient_Drivers(t *testing.T) {
-	clientTestUtil.ExecCompatible(t)
+	ctestutil.ExecCompatible(t)
 	c := testClient(t, nil)
 	defer c.Shutdown()
 
@@ -249,7 +249,7 @@ func TestClient_UpdateAllocStatus(t *testing.T) {
 }
 
 func TestClient_WatchAllocs(t *testing.T) {
-	clientTestUtil.ExecCompatible(t)
+	ctestutil.ExecCompatible(t)
 	s1, _ := testServer(t, nil)
 	defer s1.Shutdown()
 	testutil.WaitForLeader(t, s1.RPC)
@@ -318,7 +318,7 @@ func TestClient_WatchAllocs(t *testing.T) {
 }
 
 func TestClient_SaveRestoreState(t *testing.T) {
-	clientTestUtil.ExecCompatible(t)
+	ctestutil.ExecCompatible(t)
 	s1, _ := testServer(t, nil)
 	defer s1.Shutdown()
 	testutil.WaitForLeader(t, s1.RPC)
diff --git a/client/task_runner_test.go b/client/task_runner_test.go
index 2756ae02d..2bb190d4c 100644
--- a/client/task_runner_test.go
+++ b/client/task_runner_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/hashicorp/nomad/testutil"
 
-	clientTestUtil "github.com/hashicorp/nomad/client/testutil"
+	ctestutil "github.com/hashicorp/nomad/client/testutil"
 )
 
 func testLogger() *log.Logger {
@@ -46,7 +46,7 @@ func testTaskRunner() (*MockTaskStateUpdater, *TaskRunner) {
 }
 
 func TestTaskRunner_SimpleRun(t *testing.T) {
-	clientTestUtil.ExecCompatible(t)
+	ctestutil.ExecCompatible(t)
 	upd, tr := testTaskRunner()
 	go tr.Run()
 	defer tr.Destroy()
@@ -82,7 +82,7 @@ func TestTaskRunner_SimpleRun(t *testing.T) {
 }
 
 func TestTaskRunner_Destroy(t *testing.T) {
-	clientTestUtil.ExecCompatible(t)
+	ctestutil.ExecCompatible(t)
 	upd, tr := testTaskRunner()
 
 	// Change command to ensure we run for a bit
@@ -117,7 +117,7 @@ func TestTaskRunner_Destroy(t *testing.T) {
 }
 
 func TestTaskRunner_Update(t *testing.T) {
-	clientTestUtil.ExecCompatible(t)
+	ctestutil.ExecCompatible(t)
 	_, tr := testTaskRunner()
 
 	// Change command to ensure we run for a bit