diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb58a9679..a77169acf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -511,15 +511,11 @@ macOS arm64:
     when: 'always'
     expire_in: "7 days"
     paths:
-      - build/meson-logs/*.txt
-      - build/meson-private/*.pc
-      - build/test/*.log
-      - build/test/pdiff/*.log
-      - build/test/output
+      - "*"
     exclude:
-      - "build/test/**/*.cs"
-      - "build/test/**/*.trace"
-  before_script:
+      - ".git*"
+      - ".git/**/*"
+  script:
     # Install the DejaVu fonts
     - curl -LO https://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-2.37.zip
     - unzip dejavu-fonts-ttf-2.37.zip
@@ -536,14 +532,59 @@ macOS arm64:
     ####- open /Applications/Python\ 3.8/Install\ Certificates.command
     # Get ninja
     - pip3 install -U ninja
-  script:
+
     # FIXME
     - export PATH=${PATH}:/Users/gst-ci/Library/Python/3.9/bin
     - CERT_PATH=$(python3 -m certifi) && export SSL_CERT_FILE=${CERT_PATH} && export REQUESTS_CA_BUNDLE=${CERT_PATH}
-    # pixman region-test fails to link on macOS
-    - meson setup -Dpixman:tests=disabled build
+
+    - |
+       meson setup build \
+        -Dfontconfig=enabled \
+        -Dfreetype=enabled \
+        -Dglib=enabled \
+        -Dzlib=enabled \
+        -Dglib:tests=false \
+        -Dglib:sysprof=disabled \
+        -Dpixman:tests=disabled \
+        -Dpixman:demos=disabled \
+        -Dfontconfig:doc=disabled \
+        -Dfontconfig:tests=disabled \
+        -Dfreetype:tests=disabled
     - meson compile --verbose -C build
-    # Test cairo-quartz. Other backends should be covered by other jobs
+
+.test macos:
+  dependencies:
+    - 'macOS arm64'
+  needs:
+    - 'macOS arm64'
+  extends:
+    - 'macOS arm64'
+  tags:
+    - gst-mac-arm
+  stage: 'test'
+  artifacts:
+    when: 'always'
+    expire_in: "7 days"
+    paths:
+      - build/meson-logs/*
+      - build/test/*.log
+      - build/test/pdiff/*.log
+      - build/test/output
+    exclude:
+      - "build/test/**/*.cs"
+      - "build/test/**/*.trace"
+
+test macos quartz:
+  extends: '.test macos'
+  script:
+    # Install the DejaVu fonts
+    - curl -LO https://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-2.37.zip
+    - unzip dejavu-fonts-ttf-2.37.zip
+    - cp dejavu-fonts-ttf-2.37/ttf/*.ttf /Library/Fonts
+    # FIXME
+    - export PATH=${PATH}:/Users/gst-ci/Library/Python/3.9/bin
+    - CERT_PATH=$(python3 -m certifi) && export SSL_CERT_FILE=${CERT_PATH} && export REQUESTS_CA_BUNDLE=${CERT_PATH}
+
     - export CAIRO_TEST_IGNORE_quartz_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-quartz-argb32.txt)
     - export CAIRO_TEST_IGNORE_quartz_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-quartz-rgb24.txt)
     - export CAIRO_TEST_TARGET=quartz