diff --git a/circle.yml b/circle.yml
index da8e46b14..695a61395 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,8 +1,11 @@
 version: 2
+executorType: machine
 jobs:
   build:
-    working_directory: /go/src/github.com/moby/tool
+    environment:
+      GOPATH: /home/circleci/.go_workspace
+    working_directory: $GOPATH/src/github.com/moby/tool
     steps:
       - checkout
       - run: go get github.com/golang/lint/golint
-      - run: make test
\ No newline at end of file
+      - run: cd $GOPATH/src/github.com/moby/tool && make test
\ No newline at end of file