diff --git a/.github/workflows/test_fast.yml b/.github/workflows/test_fast.yml
index 821760f9e5b..1673685448e 100644
--- a/.github/workflows/test_fast.yml
+++ b/.github/workflows/test_fast.yml
@@ -41,6 +41,13 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y shellcheck sqlite3
 
+      - name: Patch DNS
+        if: startsWith(matrix.os, 'macos')
+        run: |
+          # see https://github.com/actions/runner-images/issues/8649#issuecomment-1779548056
+          echo -e "$(ipconfig getifaddr en0) $(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
+          dscacheutil -q host -a name $(hostname -f)
+
       - name: Install
         run: |
           pip install -e ."[all]"
diff --git a/.github/workflows/test_functional.yml b/.github/workflows/test_functional.yml
index 2c3915b6caf..aa55b850fdf 100644
--- a/.github/workflows/test_functional.yml
+++ b/.github/workflows/test_functional.yml
@@ -103,6 +103,25 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Patch DNS
+        if: startsWith(matrix.os, 'macos')
+        run: |
+          # see https://github.com/actions/runner-images/issues/8649#issuecomment-1779548056
+          echo -e "$(ipconfig getifaddr en0) $(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
+          dscacheutil -q host -a name $(hostname -f)
+          CONF_PATH="$HOME/.cylc/flow/8"
+          mkdir -p "$CONF_PATH"
+          cat > "$CONF_PATH/global.cylc" <<__HERE__
+          [platforms]
+            [[localhost, $(hostname -f), $(hostname -s)]]
+              hosts = localhost
+              install target = localhost
+              ssh command = ssh -oBatchMode=yes -oConnectTimeout=8 -oStrictHostKeyChecking=no
+          __HERE__
+          cp "$CONF_PATH/global.cylc" "$CONF_PATH/global-tests.cylc"
+          echo "# $CONF_PATH/global-tests.cylc"
+          cat "$CONF_PATH/global-tests.cylc"
+
       - name: Brew Install
         if: startsWith(matrix.os, 'macos')
         run: |
@@ -248,6 +267,7 @@ jobs:
               -exec echo '====== {} ======' \; -exec cat '{}' \;
 
       - name: Set artifact upload name
+        if: always()
         id: uploadname
         run: |
           # artifact name cannot contain '/' characters