diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 3d71e7fd..31f68d69 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: 
-          - ubuntu-18.04
+          - ubuntu-22.04
         compiler:
           - gcc
           - clang
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index c725ef1a..5225ba4c 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -13,7 +13,7 @@ jobs:
           - '-Dglx=no'
           - '-Degl=no'
           - '-Dx11=false'
-    runs-on: macos-10.15
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
diff --git a/.github/workflows/msvc-env.yml b/.github/workflows/msvc-env.yml
index a4e69c89..45a7e4f3 100644
--- a/.github/workflows/msvc-env.yml
+++ b/.github/workflows/msvc-env.yml
@@ -15,9 +15,15 @@ jobs:
     - uses: actions/checkout@master
     - uses: actions/setup-python@v1
     - uses: seanmiddleditch/gha-setup-vsdevenv@master
-    - uses: BSFishy/meson-build@v1.0.1
+    - uses: BSFishy/meson-build@v1.0.3
       with:
         action: test
         directory: _build
-        options: --verbose --fatal-meson-warnings
+        setup-options: --fatal-meson-warnings
+        options: --verbose
         meson-version: 0.54.3
+    - uses: actions/upload-artifact@v4
+      if: failure()
+      with:
+        name: msvc-ci
+        path: _build/meson-logs/
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index 0f90a2bc..f1b2a2c9 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -18,10 +18,24 @@ jobs:
     - uses: actions/checkout@master
     - uses: msys2/setup-msys2@v2
       with:
-        msystem: MINGW64
+        msystem: UCRT64
         update: true
-        install: base-devel git mingw-w64-x86_64-meson mingw-w64-x86_64-ninja mingw-w64-x86_64-pkg-config mingw-w64-x86_64-python3 mingw-w64-x86_64-python3-pip mingw-w64-x86_64-toolchain
+        install: >-
+          base-devel
+          git
+          mingw-w64-ucrt-x86_64-meson
+          mingw-w64-ucrt-x86_64-ninja
+          mingw-w64-ucrt-x86_64-pkg-config
+          mingw-w64-ucrt-x86_64-python
+          mingw-w64-ucrt-x86_64-python-pip
+          mingw-w64-ucrt-x86_64-toolchain
     - name: Build
       run: |
         meson setup _build
         meson compile -C _build
+        meson test -C _build
+    - uses: actions/upload-artifact@v4
+      if: failure()
+      with:
+        name: msys2-ci
+        path: _build/meson-logs/
diff --git a/test/wgl_common.c b/test/wgl_common.c
index e8d9c26a..8064bf13 100644
--- a/test/wgl_common.c
+++ b/test/wgl_common.c
@@ -112,6 +112,8 @@ make_window_and_test(int (*callback)(HDC hdc))
         exit(1);
     }
 
+    LoadLibrary ("OPENGL32.DLL");
+
     /* create window */
     hwnd = CreateWindow(class_name, window_name,
                         WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,