diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..57131ae
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,19 @@
+jobs:
+  build:
+    docker:
+      - image: buildpack-deps:trusty
+    steps:
+      - checkout
+      - run:
+          name: Install Swift
+          command: 'eval "$(curl -sL https://apt.vapor.sh)"'
+      - run:
+          name: Install Vapor toolbox
+          command: |
+            sudo apt-get install --yes vapor
+            sudo apt-get install --yes cmysql
+            sudo chmod -R a+rx /usr/
+      - run:
+          name: Run Tests
+          command: |
+            swift test -Xswiftc -DNOJSON
diff --git a/.travis.yml b/.travis.yml
index 22da891..2563016 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,11 @@ before_install:
   gem install xcpretty;
 
 script:
+  - set -o pipefail
   - swift build
   - swift build -c release
   - swift package generate-xcodeproj --enable-code-coverage
-  - xcodebuild -scheme AdminPanelNodesSSO -enableCodeCoverage YES test | xcpretty && exit ${PIPESTATUS[0]}
+  - xcodebuild -scheme AdminPanelNodesSSO -enableCodeCoverage YES test | xcpretty
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index c15e3fb..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-dependencies:
-  override:
-    - eval "$(curl -sL https://apt.vapor.sh)"
-    - sudo apt-get install vapor
-    - sudo chmod -R a+rx /usr/
-test:
-  override:
-    - swift build
-    - swift build -c release
-    - swift test