diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 413cd60371..c0334b40fe 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -290,7 +290,7 @@ jobs:
           else
             # avoid libtool's curl.exe wrapper
             mv bld/src/.libs/curl.exe bld/src/curl.exe
-            mv bld/lib/.libs/*.dll bld/src || true
+            cp bld/lib/.libs/*.dll bld/src || true
           fi
           find . -name '*.exe' -o -name '*.dll'
           if [ '${{ matrix.test }}' != 'uwp' ]; then  # curl: error initializing curl library
@@ -306,6 +306,17 @@ jobs:
           else
             make -C bld -j5 V=1 -C tests
           fi
+          if [ '${{ matrix.build }}' != 'cmake' ]; then
+            # avoid libtool's .exe wrappers
+            mv bld/tests/http/clients/.libs/*.exe bld/tests/http/clients
+            mv bld/tests/libtest/.libs/*.exe bld/tests/libtest
+            mv bld/tests/server/.libs/*.exe bld/tests/server
+            mv bld/tests/unit/.libs/*.exe bld/tests/unit || true
+            cp bld/lib/.libs/*.dll bld/tests/http/clients || true
+            cp bld/lib/.libs/*.dll bld/tests/libtest || true
+            cp bld/lib/.libs/*.dll bld/tests/server || true
+            cp bld/lib/.libs/*.dll bld/tests/unit || true
+          fi
 
       - name: 'install test prereqs'
         if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}