diff --git a/circle.yml b/circle.yml
index 35ace2ce8..453528c46 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,27 +1,16 @@
-machine:
-  pre:
-    - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0
-    - sudo rm -rf /usr/local/go
-    - curl -sSL https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz | sudo tar xz -C /usr/local
-  services:
-    - docker
+version: 2
 
-dependencies:
-  pre:
-    - sudo curl -L "https://github.com/docker/compose/releases/download/1.10.0/docker-compose-linux-x86_64" -o /usr/local/bin/docker-compose
-    - sudo chmod +x /usr/local/bin/docker-compose
-    - docker-compose -f docker-compose-integration.yml up -d --force-recreate
-
-test:
-  pre:
-    - mkdir -p /home/ubuntu/.go_workspace/src/github.com/go-kit
-    - mv /home/ubuntu/kit /home/ubuntu/.go_workspace/src/github.com/go-kit
-    - ln -s /home/ubuntu/.go_workspace/src/github.com/go-kit/kit /home/ubuntu/kit
-    - go get -t github.com/go-kit/kit/...
-  override:
-    - go test -v -race -tags integration github.com/go-kit/kit/...:
-        environment:
-          ETCD_ADDR: http://localhost:2379
-          CONSUL_ADDR: localhost:8500
-          ZK_ADDR: localhost:2181
-          EUREKA_ADDR: http://localhost:8761/eureka
+jobs:
+  build:
+    machine: true
+    working_directory: /home/circleci/.go_workspace/src/github.com/go-kit/kit
+    environment:
+      ETCD_ADDR: http://localhost:2379
+      CONSUL_ADDR: localhost:8500
+      ZK_ADDR: localhost:2181
+      EUREKA_ADDR: http://localhost:8761/eureka     
+    steps:
+      - checkout
+      - run: docker-compose -f docker-compose-integration.yml up -d --force-recreate
+      - run: go get -t github.com/go-kit/kit/...
+      - run: go test -v -race -tags integration github.com/go-kit/kit/...