diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0ee3cf612ef70c517cec058d38f12cfb66846ef8..5edf8d04dcb55fe93ceadfc626ff1d51ab95247c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 
 version: 2
 jobs:
-  build:  
+  ios_e2e:
     macos:
       xcode: "10.2.1"
     steps:
@@ -9,18 +9,41 @@ jobs:
       - run:
           name: Install Dependencies
           command: scripts/install.ios.sh
+      - run:
+          name: npm install
+          command: npm install
+      - run:
+          name: Detox iOS e2e tests
+          command: 'npm run test-e2e-ios-release'
+  android_unit:
+    macos:
+      xcode: "10.2.1"
+    steps:
+      - checkout
       - run:
           name: Install Android
           command: scripts/install.android.sh
       - run:
           name: npm install
           command: npm install
-      - run:
-          name: iOS unit tests
-          command: 'npm run test-unit-ios'
       - run:
           name: Android unit tests
           command: 'npm run test-unit-android'
+  ios_unit:
+    macos:
+      xcode: "10.2.1"
+    steps:
+      - checkout
       - run:
-          name: Detox iOS e2e tests
-          command: 'npm run test-e2e-ios-release'
\ No newline at end of file
+          name: npm install
+          command: npm install
+      - run:
+          name: iOS unit tests
+          command: 'npm run test-unit-ios'
+workflows:
+  version: 2	
+  test_all:
+    jobs:
+      - ios_e2e	
+      - android_unit
+      - ios_unit
\ No newline at end of file