diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
index 728925fde6..e91e4edbf6 100644
--- a/.github/workflows/Windows.yml
+++ b/.github/workflows/Windows.yml
@@ -11,6 +11,33 @@ concurrency:
   cancel-in-progress: true     
 
 jobs:               
+  mingw-build:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7.0.1
+      - name: Setup MSYS2 (UCRT64 / MinGW-w64)
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
+          install: >-
+            mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-cmake
+            mingw-w64-ucrt-x86_64-ninja
+            python3
+      - name: Build Z3 with MinGW
+        shell: msys2 {0}
+        run: |
+          mkdir build && cd build
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
+          ninja -j$(nproc) shell test-z3
+      - name: Run unit tests
+        shell: msys2 {0}
+        run: |
+          cd build
+          ./test-z3.exe /a
+
   build:
     strategy:
       matrix:
diff --git a/src/test/hwf.cpp b/src/test/hwf.cpp
index b81a9cef30..8ed3155d5d 100644
--- a/src/test/hwf.cpp
+++ b/src/test/hwf.cpp
@@ -19,6 +19,7 @@ Revision History:
 #include "util/hwf.h"
 #include "util/f2n.h"
 #include "util/rational.h"
+#include <cfloat>
 #include <iostream>
 
 static void bug_set_double() {
diff --git a/src/test/quant_elim.cpp b/src/test/quant_elim.cpp
index cd3b52553e..cd03273448 100644
--- a/src/test/quant_elim.cpp
+++ b/src/test/quant_elim.cpp
@@ -497,10 +497,9 @@ void tst_quant_elim() {
    
 
     memory::finalize();
-#ifdef _WINDOWS
+#if defined(_WINDOWS) && defined(_MSC_VER)
     _CrtDumpMemoryLeaks();
 #endif
     exit(0);
 }
 
-