diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index a30e1960625..bcd8532a3d2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -115,7 +115,7 @@ jobs:
             etherpad/src/bin/doc/package-lock.json
       -
         name: Install Cypress
-        run: cd src && npm install cypress
+        run: cd etherpad && cd src && npm install cypress
       -
         name: Run Etherpad
         run: |
diff --git a/src/bin/buildForWindows.sh b/src/bin/buildForWindows.sh
index 3d04fff7236..4b7b7576171 100755
--- a/src/bin/buildForWindows.sh
+++ b/src/bin/buildForWindows.sh
@@ -19,6 +19,9 @@ workdir=$(try git rev-parse --show-toplevel) || exit 1
 try cd "${workdir}"
 [ -f src/package.json ] || fatal "failed to cd to etherpad root directory"
 
+# See https://github.com/msys2/MSYS2-packages/issues/1216
+export MSYS=winsymlinks:lnk
+
 OUTPUT=${workdir}/etherpad-win.zip
 
 TMP_FOLDER=$(try mktemp -d) || exit 1