diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..3cd3fb8
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,19 @@
+version: 2
+jobs:
+  build:
+    docker:
+    - image: circleci/golang:1.11
+      environment:
+        GO111MODULE: "on"
+    working_directory: /go/src/github.com/sspinc/terraform-provider-credstash
+    steps:
+    - checkout
+    - restore_cache:
+        keys:
+        - go-mod-v1-{{ checksum "go.sum" }}
+        - go-mod-v1-
+    - run: go test ./...
+    - save_cache:
+        key: go-mod-v1-{{ checksum "go.sum" }}
+        paths:
+        - /go/pkg/mod
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index c05f5d2..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-machine:
-  environment:
-    GODIST: "go1.8.linux-amd64.tar.gz"
-  post:
-    - mkdir -p /home/ubuntu/download
-    - test -e /home/ubuntu/download/$GODIST || curl -o /home/ubuntu/download/$GODIST https://storage.googleapis.com/golang/$GODIST
-    - sudo rm -rf /usr/local/go
-    - sudo tar -C /usr/local -xzf /home/ubuntu/download/$GODIST
-
-dependencies:
-  cache_directories:
-    - /home/ubuntu/download
-
-test:
-  override:
-    - go version
-    - make test