diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..db6fc036
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,57 @@
+version: 2
+
+jobs:
+  build-and-test:
+    environment:
+      BUNDLE_PATH: vendor/bundle
+      FL_OUTPUT_DIR: output
+    macos:
+      xcode: "9.4.1"
+    working_directory: ~/VimeoUpload
+    shell: /bin/bash --login -o pipefail
+    
+    steps:
+      - checkout
+      
+      - restore_cache:
+          key: v1-gems-{{ checksum "Gemfile.lock" }}
+
+      - run: 
+          name: Set Ruby version
+          command: echo "ruby-2.4" > ~/.ruby-version
+
+      - run: 
+          name: Install bundler dependencies
+          command: bundle install --path vendor/bundle
+
+      - run: 
+          name: Build and run VimeoUpload-iOS tests
+          command: bundle exec fastlane scan
+          environment:
+            SCAN_DEVICE: iPhone 8
+            SCAN_SCHEME: VimeoUpload-iOS
+
+      - run: 
+          name: Build and run VimeoUpload-iOS-OldUpload tests
+          command: bundle exec fastlane scan
+          environment:
+            SCAN_DEVICE: iPhone 8
+            SCAN_SCHEME: VimeoUpload-iOS-OldUpload
+
+      - save_cache:
+          paths:
+            - vendor/bundle
+          key: v1-gems-{{ checksum "Gemfile.lock" }}
+
+      - store_artifacts:
+          path: output
+
+      - store_test_results:
+          path: output/scan
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - build-and-test
+      
\ No newline at end of file
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index b63bcce9..00000000
--- a/circle.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-machine:
-  xcode:
-    version: 9.0.1
-
-dependencies:
-    override:
-        - bundle install --deployment
-    cache_directories:
-        - "vendor/bundle"
-
-test:
-  override:
-    - FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane test