diff --git a/.github/actions/supercollider/action.yml b/.github/actions/supercollider/action.yml
index 8728bf546..441adea7a 100644
--- a/.github/actions/supercollider/action.yml
+++ b/.github/actions/supercollider/action.yml
@@ -4,7 +4,7 @@ inputs:
   branch:
     description: SuperCollider branch
     required: false
-    default: Version-3.13.0
+    default: develop
   origin:
     description: SuperCollider repo origin
     required: false
@@ -16,15 +16,6 @@ runs:
       id: current-date
       run: echo "stamp=$(date '+%Y-%m-%d')" >> $GITHUB_OUTPUT
       shell: bash
-    - name: Clone SuperCollider
-      run: |
-        git clone \
-          --quiet \
-          --recursive \
-          --branch ${{ inputs.branch }} \
-          ${{ inputs.origin }} \
-          /tmp/supercollider
-      shell: bash
     - name: '[macOS] Cache Homebrew'
       id: cache-homebrew
       if: runner.os == 'macOS'
@@ -74,6 +65,32 @@ runs:
           fftw \
           jack \
           portaudio
+          # brew install --cask blackhole-16ch
+      shell: bash
+    - name: Setup Jack
+      run: |
+        echo "Setting up Jack..."
+        if [ "$RUNNER_OS" == "Linux" ]; then
+          sudo usermod -a -G audio ${USER}
+        fi
+        sleep 5
+        echo "Starting Jack..."
+        sudo -E su ${USER} -c "jackd -r -ddummy -r44100 -p1024" &
+        echo "Waiting for Jack..."
+        sleep 5
+      shell: bash
+    - name: '[macOS] Debug Jack'
+      if: runner.os == 'macOS'
+      run: system_profiler -json | jq .SPAudioDataType
+      shell: bash
+    - name: Clone SuperCollider
+      run: |
+        git clone \
+          --quiet \
+          --recursive \
+          --branch ${{ inputs.branch }} \
+          ${{ inputs.origin }} \
+          /tmp/supercollider
       shell: bash
     - name: '[Linux] Configure'
       if: runner.os == 'Linux'
@@ -121,7 +138,7 @@ runs:
       if: runner.os == 'Linux'
       run: |
         cd /tmp/supercollider/build
-        sudo make install -j2
+        sudo make install -j2 > build.log || (cat build.log && false)
         mkdir -p /home/runner/.local/share/SuperCollider/synthdefs
       shell: bash
     - name: '[macOS] Install'
@@ -134,16 +151,6 @@ runs:
     - name: Debug ccache
       run: ccache --show-stats --show-config
       shell: bash
-    - name: Setup Jack
-      run: |
-        echo "Setting up Jack..."
-        if [ "$RUNNER_OS" == "Linux" ]; then
-          sudo usermod -a -G audio ${USER}
-        fi
-        sleep 1
-        sudo -E su ${USER} -c "jackd -r -ddummy -r44100 -p1024" &
-        sleep 1
-      shell: bash
     - name: Sanity-check scsynth
       run: |
         echo "Sanity-checking scsynth..."
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d9f391888..4fea12883 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   SC_ORIGIN: https://github.com/supercollider/supercollider.git
-  SC_BRANCH: develop
+  SC_BRANCH: Version-3.13.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/tests/contexts/test_Server_misc.py b/tests/contexts/test_Server_misc.py
index 995b69796..5b58eae7b 100644
--- a/tests/contexts/test_Server_misc.py
+++ b/tests/contexts/test_Server_misc.py
@@ -106,16 +106,17 @@ async def test_query_version(context):
     stdout = completed_subprocess.stdout
     line = completed_subprocess.stdout.splitlines()[0]
     print(stdout, line)
-    (program_name, major, minor, patch, branch, commit) = re.match(
-        r"(\w+) (\d+)\.(\d+)(\.[\w-]+) \(Built from branch '([\W\w]+)' \[([\W\w]+)\]\)",
+    groups = re.match(
+        r"(\w+) (\d+)\.(\d+)(\.[\w-]+) \(Built from (?:branch|tag) '([\W\w]+)' \[([\W\w]+)\]\)",
         line,
     ).groups()
+    program_name, major, minor, patch, ref, commit = groups
     expected_info = VersionInfo(
         program_name=program_name,
         major=int(major),
         minor=int(minor),
         patch=patch,
-        branch=branch,
+        branch=ref,
         commit=commit,
     )
     assert await get(context.query_version()) == expected_info