diff --git a/circle.yml b/circle.yml
index 655f9bc2b7..ef2f49a44a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,19 +1,15 @@
 machine:
   pre:
-  # Install gvm
     - bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/1.0.22/binscripts/gvm-installer)
-  # Install bats
-    - git clone https://github.com/sstephenson/bats.git && cd bats && sudo ./install.sh /usr/local
 
   post:
     - gvm install go1.5.3 -B --name=stable
 
   environment:
-  # Convenient shortcuts to "common" locations
     CHECKOUT: /home/ubuntu/$CIRCLE_PROJECT_REPONAME
     BASE_DIR: src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
-  # Trick circle brainflat "no absolute path" behavior
     BASE_STABLE: ../../../$HOME/.gvm/pkgsets/stable/global/$BASE_DIR
+    GO15VENDOREXPERIMENT: 1
 
 dependencies:
   override:
@@ -24,12 +20,11 @@ dependencies:
 
 test:
   pre:
-    - gvm use stable && go version
     - gvm use stable && make build:
         pwd: $BASE_STABLE
-    - gvm use stable && GO15VENDOREXPERIMENT=1 go get github.com/docker/docker-machine-driver-ci-test
+    - gvm use stable && go get github.com/docker/docker-machine-driver-ci-test
 
   override:
-    - gvm use stable && PATH=../../../../bin:$PATH DRIVER=ci-test GO15VENDOREXPERIMENT=1 go test -v github.com/docker/machine/its/...:
+    - gvm use stable && PATH=../../../../bin:$PATH DRIVER=ci-test go test -v github.com/docker/machine/its/...:
         pwd: $BASE_STABLE
         timeout: 600