diff --git a/circle.yml b/circle.yml
index b327e8f4..0279a97b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,20 +7,21 @@ machine:
     XCODE_SCHEME: test
     XCODE_WORKSPACE: test
     XCODE_PROJECT: test
-    GOPATH: $HOME/$CIRCLE_PROJECT_REPONAME
+    GOPATH: $HOME/go
 
 general:
-  build_dir: src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
+  build_dir: ~/go/src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
 
 dependencies:
   pre:
+    - mkdir -p ~/go/src/github.com/$CIRCLE_PROJECT_USERNAME
     - brew update
     - brew prune
     - brew upgrade go || brew install go
     - brew upgrade git || brew install git
   override:
-    - mkdir -p src/github.com/$CIRCLE_PROJECT_USERNAME
-    - ln -s "$GOPATH" src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
+    - script/bootstrap
+    - ln -s ~/$CIRCLE_PROJECT_USERNAME/ ~/go/src/github.com/$CIRCLE_PROJECT_USERNAME
 
 test:
   override: