diff --git a/circle.yml b/circle.yml
index 39566ed26af..9648edec90f 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,9 +1,16 @@
 machine:
   services:
     - docker
+  environment:
+    GOPATH: "/home/ubuntu/.go_workspace"
+    ORG_PATH: "github.com/grafana"
+    REPO_PATH: "${ORG_PATH}/grafana"
 
 dependencies:
   override:
+    - rm -rf ${GOPATH}/src/${REPO_PATH}
+    - mkdir -p ${GOPATH}/src/${ORG_PATH}
+    - cp -r ../grafana ${GOPATH}/src/${ORG_PATH}
     - go get github.com/tools/godep
     - npm install