diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..c9d0cf7
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,37 @@
+version: 2
+
+jobs:
+  macos:
+    macos:
+      xcode: "9.0"
+    steps:
+      - run: brew install vapor/tap/vapor
+      - checkout
+      - run: swift build
+      - run: swift test
+
+  linux-3:
+    docker:
+      - image: swift:3.1.1
+    steps:
+      - run: apt-get install -yq libssl-dev
+      - checkout
+      - run: swift build
+      - run: swift test
+
+  linux:
+    docker:
+      - image: swift:4.0.3
+    steps:
+      - run: apt-get install -yq libssl-dev
+      - checkout
+      - run: swift build
+      - run: swift test
+
+workflows:
+  version: 2
+  tests:
+    jobs:
+      - macos
+      - linux-3
+      - linux
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 55985d4..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-dependencies:
-  override:
-    - eval "$(curl -sL https://apt.vapor.sh)"
-    - sudo apt-get install swift
-    - sudo chmod -R a+rx /usr/
-test:
-  override:
-    - swift build
-    - swift build -c release
-    - swift test
-    - sudo apt-get remove swift
-    - sudo apt-get install swift-beta
-    - swift build
-    - swift build -c release
-    - swift test
-    
\ No newline at end of file