diff --git a/.circleci/config.yml b/.circleci/config.yml
index d74eda7806..6ce34f5b5b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,7 +29,6 @@ jobs:
       - image: *GOLANG_IMAGE
     environment: &build-env
       GOXPARALLEL: 2 # CircleCI containers are 2 CPU x 4GB RAM
-    working_directory: /go/src/github.com/hashicorp/consul
     steps:
       - checkout
       - run: make tools
@@ -67,7 +66,6 @@ jobs:
   dev-build:
     docker:
       - image: *GOLANG_IMAGE
-    working_directory: /go/src/github.com/hashicorp/consul
     steps:
       - checkout
       - run: make dev
diff --git a/GNUmakefile b/GNUmakefile
index 0a71c52387..8d612b3a11 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,7 +1,7 @@
 SHELL = bash
 GOTOOLS = \
-	github.com/elazarl/go-bindata-assetfs/... \
-	github.com/hashicorp/go-bindata/... \
+	github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs \
+	github.com/hashicorp/go-bindata/go-bindata \
 	github.com/mitchellh/gox \
 	golang.org/x/tools/cmd/cover \
 	golang.org/x/tools/cmd/stringer \