diff --git a/.circleci/circle.yml b/.circleci/circle.yml
new file mode 100644
index 00000000..3fc8f0b6
--- /dev/null
+++ b/.circleci/circle.yml
@@ -0,0 +1,25 @@
+version: 2
+
+jobs:
+  build:
+    working_directory: /go/src/github.com/tendermint/go-crypto
+    docker:
+    - image: circleci/golang:1.10.0
+      environment:
+        GOBIN: /tmp/workspace/bin
+    steps:
+      - run: mkdir -p /tmp/workspace/bin
+      - run: mkdir -p /tmp/workspace/profiles
+      - checkout
+      - restore_cache:
+              keys:
+              - v1-dep-{{ .Branch }}
+      - run:
+              name: test
+              command: |
+                go version
+                cd $PROJECT_PATH && make get_tools && make all
+    - save_cache:
+        key: v1-dep-{{ .Branch }}
+        paths:
+        - /go/pkg
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index af63a059..00000000
--- a/circle.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-machine:
-  environment:
-    GOPATH: /home/ubuntu/.go_workspace
-    PROJECT_PARENT_PATH: "$GOPATH/src/github.com/$CIRCLE_PROJECT_USERNAME"
-    PROJECT_PATH: $GOPATH/src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
-    GO15VENDOREXPERIMENT: 1
-  hosts:
-    circlehost: 127.0.0.1
-    localhost: 127.0.0.1
-
-dependencies:
-  override:
-    - mkdir -p "$PROJECT_PARENT_PATH"
-    - ln -sf "$HOME/$CIRCLE_PROJECT_REPONAME/" "$PROJECT_PATH"
-  post:
-    - go version
-
-test:
-  override:
-    - "go version"
-    - "cd $PROJECT_PATH && make get_tools && make all"