diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..df913dd
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,38 @@
+version: 2
+
+defaults: &defaults
+  working_directory: /go/src/github.com/remind101/ssm-env
+  docker:
+    - image: circleci/golang:1.11.6
+  environment:
+    GO111MODULE: "on"
+
+workflows:
+  version: 2
+  build-and-test:
+    jobs:
+      - test
+      - build
+
+jobs:
+
+  test:
+    << : *defaults
+    steps:
+      - checkout:
+          path: /go/src/github.com/remind101/ssm-env
+      - run:
+          command: make test
+          working_directory: /go/src/github.com/remind101/ssm-env
+
+  build:
+    << : *defaults
+    steps:
+      - checkout:
+          path: /go/src/github.com/remind101/ssm-env
+      - run:
+          command: make bin/ssm-env
+          working_directory: /go/src/github.com/remind101/ssm-env
+      - store_artifacts:
+          path: /go/src/github.com/remind101/ssm-env/bin/ssm-env
+          destination: ssm-env
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index b4e8de5..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-machine:
-  environment:
-    GODIST: "go1.7.linux-amd64.tar.gz"
-  post:
-    - mkdir -p download
-    - test -e download/$GODIST || curl -o download/$GODIST https://storage.googleapis.com/golang/$GODIST
-    - sudo rm -rf /usr/local/go
-    - sudo tar -C /usr/local -xzf download/$GODIST
-    - sudo ln -s /usr/local/go/bin/go /usr/bin/go
-    - sudo go install -a -race std
-
-test:
-  override:
-    - make test