diff --git a/.github/workflows/simulator.yml b/.github/workflows/simulator.yml
index 916806c19..6cfb3fe2c 100644
--- a/.github/workflows/simulator.yml
+++ b/.github/workflows/simulator.yml
@@ -15,18 +15,15 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      # Cocoapods cache
+      # Common cache
       - uses: actions/cache@v2
         with:
           path: Pods
           key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-pods-
-
-      # Bundler cache
       - uses: actions/cache@v2
         with:
           path: vendor/bundle
@@ -34,17 +31,48 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gems-
 
-
+      # Common setup
       - name: Bundle install
         run: |
           bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-        
+          bundle install --jobs 4 --retry 3    
       - name: Use right MatrixKit and MatrixSDK versions
         run: bundle exec fastlane point_dependencies_to_pending_releases
 
-      - name: Build iOS simulator
-        run: bundle exec fastlane build
-
-      - name: Units tests
+      # Main job
+      - name: Unit tests
+        run: bundle exec fastlane test
+
+
+  tests:
+    name: Tests
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      # Common cache
+      - uses: actions/cache@v2
+        with:
+          path: Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+
+      # Common setup
+      - name: Bundle install
+        run: |
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3    
+      - name: Use right MatrixKit and MatrixSDK versions
+        run: bundle exec fastlane point_dependencies_to_pending_releases
+
+      # Main job
+      - name: Unit tests
         run: bundle exec fastlane test