diff --git a/circle.yml b/circle.yml
index 9cb5cdce9fa..cb0043ef053 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,36 +1,7 @@
-machine:
-  java:
-    version: oraclejdk8
-  environment:
-    DOCKER_HOST: tcp://127.0.0.1:2376
-    DOCKER_TLS_VERIFY: 0
-    MAVEN_OPTS: -Xmx512m
-    _JAVA_OPTIONS: "-Xms512m -Xmx1024m"
-  services:
-    - docker
-  pre:
-    - sudo curl -L -o /usr/bin/docker 'http://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'; sudo chmod 0755 /usr/bin/docker; true
-dependencies:
-  override:
-    - "sudo docker -d -e lxc -s btrfs -H 0.0.0.0:2376 -H unix:///var/run/docker.sock --log-level=debug --debug=true":
-        background: true
-    - mvn  -B install -DskipTests
-test:
-  override:
-    - mvn -B test
-    # Run Docker-in-Docker tests
-    - |
-      DOCKER_HOST=unix:///var/run/docker.sock DOCKER_TLS_VERIFY= docker run --rm \
-        -v "$HOME/.m2":/root/.m2/ \
-        -v /var/run/docker.sock:/var/run/docker.sock \
-        -v "$(pwd)":"$(pwd)" \
-        -w "$(pwd)" \
-        openjdk:8-jre \
-        ./mvnw -B -pl core test -Dtest=*GenericContainerRuleTest
-    - mvn -B test -f shade-test/pom.xml
-  post:
-    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
-    - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
-notify:
-  webhooks:
-    - url: https://webhooks.gitter.im/e/1bf1c6aa3b2aa8408c5f
+version: 2
+executorType: machine
+jobs:
+  build:
+    steps:
+      - checkout
+      - run: ./mvnw -B test