diff --git a/client/driver/docker_test.go b/client/driver/docker_test.go
index c4db2bf61..df1c26955 100644
--- a/client/driver/docker_test.go
+++ b/client/driver/docker_test.go
@@ -760,17 +760,7 @@ func TestDockerDriver_User(t *testing.T) {
 		t.Fatalf("Should've failed")
 	}
 
-	msgs := []string{
-		"linux spec user",
-	}
-	var found bool
-	for _, msg := range msgs {
-		if strings.Contains(err.Error(), msg) {
-			found = true
-			break
-		}
-	}
-	if !found {
+	if !strings.Contains(err.Error(), "alice") {
 		t.Fatalf("Expected failure string not found, found %q instead", err.Error())
 	}
 }
diff --git a/scripts/test.sh b/scripts/test.sh
index d19c5c2b4..b9cde8b9a 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -11,9 +11,8 @@ go build -o $TEMPDIR/nomad || exit 1
 # Run the tests
 echo "--> Running tests"
 GOBIN="`which go`"
-$GOBIN test -v -timeout=900s github.com/hashicorp/nomad/client/driver -run "TestDockerDriver*"
-#go list ./... | grep -v '^github.com/hashicorp/nomad/vendor/' | \
-#    sudo \
-#        -E PATH=$TEMPDIR:$PATH \
-#        -E GOPATH=$GOPATH \
-#        xargs $GOBIN test -v ${GOTEST_FLAGS:--cover -timeout=900s}
+go list ./... | grep -v '^github.com/hashicorp/nomad/vendor/' | \
+    sudo \
+        -E PATH=$TEMPDIR:$PATH \
+        -E GOPATH=$GOPATH \
+        xargs $GOBIN test -v ${GOTEST_FLAGS:--cover -timeout=900s}