diff --git a/circle.yml b/circle.yml
index fc23528..034b037 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,8 +3,6 @@ machine:
     - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0
   services:
     - docker
-  environment:
-    GODIR: /go/src/github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}
 
 dependencies:
   override:
@@ -26,10 +24,7 @@ test:
       --workdir /go/src/github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}
       segment/golang:latest
       go.test='govendor test -v -cover +local'
-    - ln -s . ${GODIR}
-    - cd ${GODIR} && mkdir -p ./build
-    - cd ${GODIR} && go build -o ./build/nsq-to-nsq ./cmd/nsq-to-nsq
-    - cd ${GODIR} && go build -o ./build/nsqlookup-proxy ./cmd/nsqlookup-proxy
+      go.build='mkdir -p build && cd build && go build ../cmd/nsq-to-nsq && go build ../cmd/nsqlookup-proxy'
     - docker build -t segment/nsq .
 
 deployment: