diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8050141a0..c694866c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,14 +44,16 @@ jobs:
         os: 
           - windows-latest
           - ubuntu-latest
-          # TODO: get working on MacOS
-          #- macos-latest
+          # Sanity check, should be the same as Ubuntu (POSIX file system)
+          - macos-latest
         java-version: [ 11, 12, 13, 14, 15, 16, 17, 18, 19 ]
         include:
           - os: windows-latest
             build-script: './mvnw.cmd'
           - os: ubuntu-latest
             build-script: './mvnw'
+          - os: macos-latest
+            build-script: './mvnw'
 
     steps:
       - name: Checkout repository
diff --git a/scripts/prepare-test-outputs-for-merge.sh b/scripts/prepare-test-outputs-for-merge.sh
index 3ec1cb530..cd7770efd 100755
--- a/scripts/prepare-test-outputs-for-merge.sh
+++ b/scripts/prepare-test-outputs-for-merge.sh
@@ -42,7 +42,10 @@ if ! command -v xsltproc >/dev/null 2>&1; then
 fi
 
 echo -e "\e[1;35mUpdating Surefire reports...\e[0m"
-surefire_prefix_xslt=$(mktemp --suffix=.xslt)
+surefire_prefix_xslt_dir="$(mktemp -d)"
+trap 'rm -Rf "${surefire_prefix_xslt_dir}"' EXIT SIGINT SIGTERM SIGQUIT
+surefire_prefix_xslt="${surefire_prefix_xslt_dir}/surefire.xslt"
+
 sed 's/^  //g' >"${surefire_prefix_xslt}" <<'EOF'
   <?xml version="1.0" encoding="UTF-8"?>
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -87,8 +90,6 @@ for surefire_report in $(find-all-surefire-reports); do
   rm "${surefire_report}"
 done
 
-rm "${surefire_prefix_xslt}"
-
 echo -e "\e[1;35mUpdating Jacoco reports...\e[0m"
 for jacoco_report in $(find-all-jacoco-reports); do
   new_jacoco_report="${jacoco_report/.xml/-java-${ci_java_version}-${ci_os}.xml}"