diff --git a/circle.yml b/circle.yml
index b88c80e7f..23d595c1e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,37 +1,17 @@
 machine:
   environment:
-    GLIDE_VERSION: "0.10.1"
-    GO15VENDOREXPERIMENT: 1
-    GOPATH: /usr/local/go_workspace
-    HOME: /home/ubuntu
-    IMPORT_PATH: "github.com/kubernetes/helm"
-    PATH: $HOME/go/bin:$PATH
-    GOROOT: $HOME/go
-
-  pre:
-    - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.3
+    IMPORT_PATH: "${GOPATH%%:*}/src/github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}"
 
   services:
     - docker
 
 dependencies:
   override:
-    - mkdir -p $HOME/go
-    - wget "https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz"
-    - tar -C $HOME -xzf go1.6.linux-amd64.tar.gz
-    - go version
-    - go env
-    - sudo chown -R $(whoami):staff /usr/local
-    - cd $GOPATH
-    - mkdir -p $GOPATH/src/$IMPORT_PATH
-    - cd $HOME/helm
-    - rsync -az --delete ./ "$GOPATH/src/$IMPORT_PATH/"
-    - wget "https://github.com/Masterminds/glide/releases/download/$GLIDE_VERSION/glide-$GLIDE_VERSION-linux-amd64.tar.gz"
-    - mkdir -p $HOME/bin
-    - tar -vxz -C $HOME/bin --strip=1 -f glide-$GLIDE_VERSION-linux-amd64.tar.gz
-    - export PATH="$HOME/bin:$PATH" GLIDE_HOME="$HOME/.glide"
-    - cd $GOPATH/src/$IMPORT_PATH
+    - sudo add-apt-repository -y ppa:masterminds/glide && sudo apt-get update; sudo apt-get install glide
+    - mkdir -p "${IMPORT_PATH}"
+    - mv "~/${CIRCLE_PROJECT_REPONAME}" "${IMPORT_PATH%/*}"
+    - cd "${IMPORT_PATH}"
 
 test:
   override:
-    - cd $GOPATH/src/$IMPORT_PATH && make bootstrap test test-e2e
+    - make bootstrap test test-e2e