diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..5190138
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,40 @@
+version: 2
+
+jobs:
+  build:
+    docker:
+      - image: quay.io/weaveworks/build-golang:1.11.1-stretch
+    working_directory: /go/src/github.com/weaveworks/kubediff
+    environment:
+      GOPATH: /go
+    steps:
+    - checkout
+    - run:
+        name: Install Docker client
+        command: |
+          curl -L -o /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-17.03.0-ce.tgz
+          tar -xz -C /tmp -f /tmp/docker.tgz
+          mv /tmp/docker/* /usr/bin
+    - setup_remote_docker
+    - run:
+        name: Dependencies
+        command: |
+          pip install virtualenv
+          make deps
+    - run:
+        name: make all
+        command: |
+          mkdir -p test-results/tests
+          make JUNIT_XML=test-results/tests/junit.xml all
+    - store_test_results:
+        path: test-results
+    - deploy:
+        command: |
+          if [ "${CIRCLE_BRANCH}" == "master" ]; then
+            docker login -u $DOCKER_USER -p $DOCKER_PASS
+            docker push weaveworks/kubediff:$(./tools/image-tag)
+            docker push weaveworks/kubediff:latest
+            docker login -u "$QUAY_USER" -p "$QUAY_PASSWORD" quay.io
+            docker push quay.io/weaveworks/kubediff:$(./tools/image-tag)
+            docker push quay.io/weaveworks/kubediff:latest
+          fi
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index a1a1c6d..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-machine:
-  python:
-    version: 2.7.9
-  services:
-    - docker
-  environment:
-    PATH: $HOME/bin:$PATH
-    SRCDIR: $HOME/.go_workspace/src/github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}
-
-dependencies:
-  override:
-    - make deps
-
-test:
-  override:
-    - "mkdir -p $(dirname $SRCDIR) && cp -r $(pwd)/ $SRCDIR"
-    - "mkdir -p $CIRCLE_TEST_REPORTS/py.test/"
-    - cd $SRCDIR; make JUNIT_XML=$CIRCLE_TEST_REPORTS/py.test/junit.xml all
-
-deployment:
-  push:
-    branch: master
-    commands:
-      - docker login -e "$DOCKER_REGISTRY_EMAIL" -u "$DOCKER_REGISTRY_USER" -p "$DOCKER_REGISTRY_PASSWORD"
-      - docker push weaveworks/kubediff:$(./tools/image-tag)
-      - docker push weaveworks/kubediff:latest
-      - docker login -e "." -u "$QUAY_USER" -p "$QUAY_PASSWORD" quay.io
-      - docker push quay.io/weaveworks/kubediff:$(./tools/image-tag)
-      - docker push quay.io/weaveworks/kubediff:latest