diff --git a/.github/workflows/cmake_win.yml b/.github/workflows/cmake_win.yml
index 3244235d2..feeee0064 100644
--- a/.github/workflows/cmake_win.yml
+++ b/.github/workflows/cmake_win.yml
@@ -22,8 +22,7 @@ jobs:
             environment_script: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat",
             generators: "Ninja",
             build: "Debug",
-            openssl: true,
-            disable_openssl: "OFF",
+            openssl: "VC-WIN64A",
             testing: true
           }
         - {
@@ -32,8 +31,7 @@ jobs:
             environment_script: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat",
             generators: "Ninja",
             build: "Release",
-            openssl: true,
-            disable_openssl: "OFF",
+            openssl: "VC-WIN64A",
             testing: true
           }
         - {
@@ -42,9 +40,7 @@ jobs:
             environment_script: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsamd64_x86.bat",
             generators: "Ninja",
             build: "Debug",
-            openssl: false,
-            disable_openssl: "ON",
-            choco: "--x86",
+            openssl: "VC-WIN32",
             testing: false
           }
         - {
@@ -53,18 +49,30 @@ jobs:
             environment_script: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsamd64_arm64.bat",
             generators: "Ninja",
             build: "Debug",
-            openssl: false,
-            disable_openssl: "ON",
+            openssl: "VC-WIN64-ARM",
             testing: false
           }
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install OpenSSL
-        if: ${{ matrix.config.openssl }}
+      - uses: ilammy/setup-nasm@v1
+
+      - uses: actions/cache@v3
+        id: openssl
+        with:
+          path: C:\\Program Files\OpenSSL
+          key: ${{ runner.os }}-${ matrix.config.openssl }-openssl-3.1.4
+
+      - name: Build OpenSSL
+        shell: cmd
         run: |
-          choco install --no-progress ${{ matrix.config.choco }} openssl --version 3.1.1
+          call "${{ matrix.config.environment_script }}"
+          C:\msys64\usr\bin\wget.exe https://www.openssl.org/source/openssl-3.1.4.tar.gz
+          C:\msys64\usr\bin\tar.exe -xzf openssl-3.1.4.tar.gz
+          cd openssl-3.1.4
+          perl Configure ${{ matrix.config.openssl }}
+          nmake && nmake install
 
       - name: Build
         shell: cmd
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7e2610395..185a7b0bc 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -159,16 +159,8 @@ endif()
 # Main target object
 #
 
-set(LINKLIBS re ${OPENSSL_LIBRARIES})
-if(WIN32)
-  list(APPEND LINKLIBS qwave iphlpapi wsock32 ws2_32)
-else()
-  list(APPEND LINKLIBS m ${RESOLV_LIBRARY})
-endif()
-
-if(ZLIB_FOUND)
-  list(APPEND LINKLIBS ZLIB::ZLIB)
-endif()
+set(LINKLIBS re)
+list(APPEND LINKLIBS ${RE_LIBS})
 
 add_executable(${PROJECT_NAME} ${SRCS})
 set_property(TARGET ${PROJECT_NAME} PROPERTY ENABLE_EXPORTS 1)