diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3f37b3c30..297e36c28 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,33 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        test-type: [ui-tests, unit-tests, integration-tests, build-example-wallet, build-example-dapp]
+        test-type: [unit-tests, integration-tests, build-example-wallet, build-example-dapp]
+
+    steps:
+    - uses: actions/checkout@v2
+      
+    - name: Setup Xcode Version
+      uses: maxim-lobanov/setup-xcode@v1
+
+    - uses: actions/cache@v2
+      with:
+        path: |
+          .build
+          SourcePackages
+        key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+        restore-keys: |
+          ${{ runner.os }}-spm-
+
+    - uses: ./.github/actions/ci
+      with:
+        type: ${{ matrix.test-type }}
+
+  test-ui:
+    if: github.ref == 'refs/heads/main'
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        test-type: [ui-tests]
 
     steps:
     - uses: actions/checkout@v2