diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index d54bfb6..0f13081 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -69,6 +69,8 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           brew update
+          # Caught by https://github.com/actions/runner-images/issues/6817
+          brew link --overwrite python@3.10
           brew install --cask xquartz
         shell: bash
         
@@ -125,8 +127,18 @@ jobs:
           sudo apt install libharfbuzz-dev libfribidi-dev libgit2-dev libcurl4-openssl-dev
         shell: bash
 
+      - name: Set environment variable to never compile packages on Windows and macOS
+        if: runner.os != 'Linux' && matrix.r != 'devel'
+        run: |
+          # don't try to install new pkgs versions from source (which often requires additional system dependencies which, when missing, lead to errors, e.g., ragg).
+          cat("\noptions(install.packages.compile.from.source = \"never\")\n", file = "~/.Rprofile", sep = "", append = TRUE)
+        shell: Rscript {0}
+        
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
+          extra-packages: |
+            any::rcmdcheck
+            github::jasp-stats/jaspTools
           needs: check
           cache-version: 2
 
@@ -135,17 +147,8 @@ jobs:
         run: sudo apt install jags
         shell: bash
 
-      - name: Set environment variable to never compile packages on Windows and macOS
-        if: runner.os != 'Linux' && matrix.r != 'devel'
-        run: |
-          # don't try to install new pkgs versions from source (which often requires additional system dependencies which, when missing, lead to errors, e.g., ragg).
-          cat("\noptions(install.packages.compile.from.source = \"never\")\n", file = "~/.Rprofile", sep = "", append = TRUE)
-        shell: Rscript {0}
-
       - name: Setup jaspTools
         run: |
-          install.packages(c("remotes", "ragg"))
-          remotes::install_github("jasp-stats/jaspTools")
           jaspTools::setupJaspTools()
         shell: Rscript {0}