diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..4de71d4
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,17 @@
+version: 2.0
+
+jobs:
+    build:
+        docker:
+            - image: circleci/node:6.10
+        steps:
+            - checkout
+            - run:
+                name: Install Hugo
+                command: wget https://github.com/gohugoio/hugo/releases/download/v0.29/hugo_0.29_Linux-64bit.deb -O /tmp/hugo.deb && sudo dpkg -i /tmp/hugo.deb
+            - run:
+                name: Build site
+                command: make build
+            - run:
+                name: Run Tests
+                command: make test
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 7be4bb7..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-machine:
-  node:
-    version: 6.11.2
-
-dependencies:
-  pre:
-    - wget https://github.com/gohugoio/hugo/releases/download/v0.29/hugo_0.29_Linux-64bit.deb -O /tmp/hugo.deb && sudo dpkg -i /tmp/hugo.deb
-
-test:
-  override:
-    - make build
-    - make test