diff --git a/ports/ci/linux-mingw/install_deps.sh b/ports/ci/linux-mingw/install_deps.sh
index af0eadf..8f4ee5f 100644
--- a/ports/ci/linux-mingw/install_deps.sh
+++ b/ports/ci/linux-mingw/install_deps.sh
@@ -63,7 +63,8 @@ pacman --noconfirm --needed -S \
     wine \
     mingw-w64-pkg-config \
     mingw-w64-cmake \
-    mingw-w64-gcc
+    mingw-w64-gcc \
+    xorg-server-xvfb
 
 # Install NSIS
 
@@ -73,5 +74,5 @@ ${DOWNLOAD_CMD} "https://sourceforge.net/projects/nsis/files/NSIS%20${NSIS_VERSI
 if [ -e ${nsis} ]; then
     export WINEPREFIX=/opt/.wine
 
-    wine ./${nsis} /S
+    xvfb-run --auto-servernum wine ./${nsis} /S
 fi
diff --git a/ports/ci/windows-msys/build.sh b/ports/ci/windows-msys/build.sh
index 0f644db..f7b0610 100644
--- a/ports/ci/windows-msys/build.sh
+++ b/ports/ci/windows-msys/build.sh
@@ -47,8 +47,8 @@ cmake \
     -G "MSYS Makefiles" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
-    -DCMAKE_C_COMPILER="${COMPILER_C}" \
-    -DCMAKE_CXX_COMPILER="${COMPILER_CXX}" \
+    -DCMAKE_C_COMPILER="/mingw64/bin/${COMPILER_C}" \
+    -DCMAKE_CXX_COMPILER="/mingw64/bin/${COMPILER_CXX}" \
     ${EXTRA_PARAMS}
 cmake --build ${buildDir} --parallel ${NJOBS}
 cmake --build ${buildDir} --target install
@@ -67,8 +67,8 @@ cmake \
     -G "MSYS Makefiles" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
-    -DCMAKE_C_COMPILER="${COMPILER_C}" \
-    -DCMAKE_CXX_COMPILER="${COMPILER_CXX}" \
+    -DCMAKE_C_COMPILER="/mingw32/bin/${COMPILER_C}" \
+    -DCMAKE_CXX_COMPILER="/mingw32/bin/${COMPILER_CXX}" \
     ${EXTRA_PARAMS}
 cmake --build ${buildDir} --parallel ${NJOBS}
 cmake --build ${buildDir} --target install