diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..677de4800
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,30 @@
+version: 2
+jobs:
+  test-node:
+    docker:
+      - image: circleci/node:6.14-stretch
+    steps:
+      - checkout
+      - run: "yarn install"
+      - run: "yarn lint:ci"
+      - run: "yarn build"
+      - run: "yarn test:node -- --maxWorkers=4"
+  test-web:
+    docker:
+      - image: circleci/node:6.14-stretch
+    steps:
+      - checkout
+      - run: "yarn install"
+      # For some reason phantomjs-prebuild is failing w/yarn, but npm installing works
+      - run: "npm install phantomjs-prebuilt"
+      # Switch to 7 and lint
+      - run: "yarn test:web -- --maxWorkers=4"
+      - run: "yarn build:web -- --maxWorkers=4"
+
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - test-node
+      - test-web
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index fb117bde6..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-## Customize the test machine
-machine:
-  pre:
-    - mkdir ~/.yarn-cache
-
-  node:
-    version:
-      6.10
-
-## Customize dependencies
-dependencies:
-  pre:
-    - curl -o- -L https://yarnpkg.com/install.sh | bash
-    - nvm install 7.0.0
-    - nvm install 6.10.0
-    # For some reason phantomjs-prebuild is failing w/yarn, but npm installing works
-    - npm install phantomjs-prebuilt
-
-  cache_directories:
-    - ~/.yarn-cache
-  override:
-    - yarn install
-
-## Customize test commands
-test:
-  override:
-    # Switch to 7 and lint
-    - nvm use 7.0 && yarn lint:ci && yarn build && yarn test:node -- --maxWorkers=4:
-        parallel: true
-    - nvm use 7.0 && yarn test:web -- --maxWorkers=4 && yarn build:web -- --maxWorkers=4:
-        parallel: true
-    # Switch to check on 4.3.2
-    - nvm use 6.10 && yarn build && yarn test:node -- --maxWorkers=4:
-        parallel: true