diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4c115844908..d802c2b50b1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,17 +33,20 @@ jobs:
               os: windows-latest
               container:
               useSonarCloud: ${{ github.event_name != 'pull_request' }}
+              testOptions: --options '[Compile]Jobs=1'
             # TODO: align the target with the name
             - name: macos-clang-arm64
               target: macos-clang-arm64
               os: macos-latest
               container:
               useSonarCloud:
+              testOptions:
             - name: linux-gcc-x86_64
               target: linux-64-gcc
               os: ubuntu-latest
               container: owncloudci/appimage-build:sles15-amd64
               useSonarCloud:
+              testOptions:
     name: ${{ matrix.name }}
 
     runs-on: ${{ matrix.os }}
@@ -160,7 +163,7 @@ jobs:
 
     - name: Run tests
       run: |
-        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --test owncloud/owncloud-client
+        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --test ${{ matrix.testOptions }} owncloud/owncloud-client
 
     - name: Package
       run: |
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4b08b17387f..d78765e0b84 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -69,14 +69,14 @@ owncloud_add_test(JobQueue)
 
 add_subdirectory(modeltests)
 
-# if(WIN32)
-#     find_file(cldapi_FOUND CldApi.dll)
-#     if (cldapi_FOUND)
-#         include("${CMAKE_SOURCE_DIR}/test/owncloud_add_test.cmake")
-#         owncloud_add_test(WinVfs)
-#         target_link_libraries(WinVfsTest vfs_plugin_win_static)
-#         add_dependencies(WinVfsTest vfs_wincfapi)
-#     else()
-#         message(WARNING "Failed to detect CldApi.dll: Skipping WinVfsTest")
-#     endif()
-# endif()
+if(WIN32)
+    find_file(cldapi_FOUND CldApi.dll)
+    if (cldapi_FOUND)
+        include("${CMAKE_SOURCE_DIR}/test/owncloud_add_test.cmake")
+        owncloud_add_test(WinVfs)
+        target_link_libraries(WinVfsTest vfs_plugin_win_static)
+        add_dependencies(WinVfsTest vfs_wincfapi)
+    else()
+        message(WARNING "Failed to detect CldApi.dll: Skipping WinVfsTest")
+    endif()
+endif()
diff --git a/test/testblacklist.cpp b/test/testblacklist.cpp
index 0d892062562..554d7eed78d 100644
--- a/test/testblacklist.cpp
+++ b/test/testblacklist.cpp
@@ -31,7 +31,7 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off << false;
 
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
             // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
diff --git a/test/testdatabaseerror.cpp b/test/testdatabaseerror.cpp
index d36d09df79d..ba97aad74b9 100644
--- a/test/testdatabaseerror.cpp
+++ b/test/testdatabaseerror.cpp
@@ -25,7 +25,7 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off << false;
 
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
             // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
diff --git a/test/testdownload.cpp b/test/testdownload.cpp
index 0a508bea77e..0dfcab24642 100644
--- a/test/testdownload.cpp
+++ b/test/testdownload.cpp
@@ -74,7 +74,7 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off << false;
 
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
             // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
diff --git a/test/testlocaldiscovery.cpp b/test/testlocaldiscovery.cpp
index 0c3bbec3b1b..81a39b5d940 100644
--- a/test/testlocaldiscovery.cpp
+++ b/test/testlocaldiscovery.cpp
@@ -28,7 +28,7 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off << false;
 
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
             // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
diff --git a/test/testlockedfiles.cpp b/test/testlockedfiles.cpp
index 481835bc686..b1650c5e060 100644
--- a/test/testlockedfiles.cpp
+++ b/test/testlockedfiles.cpp
@@ -44,7 +44,7 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off << false;
 
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
             // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
diff --git a/test/testpermissions.cpp b/test/testpermissions.cpp
index 77e27e901d3..a1e1585c15b 100644
--- a/test/testpermissions.cpp
+++ b/test/testpermissions.cpp
@@ -77,7 +77,7 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off << false;
 
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
             // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
diff --git a/test/testremotediscovery.cpp b/test/testremotediscovery.cpp
index c55ee818188..2ba69601682 100644
--- a/test/testremotediscovery.cpp
+++ b/test/testremotediscovery.cpp
@@ -56,7 +56,7 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off << false;
 
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
             // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
diff --git a/test/testsyncconflict.cpp b/test/testsyncconflict.cpp
index c2e89c18e02..12b3e47db25 100644
--- a/test/testsyncconflict.cpp
+++ b/test/testsyncconflict.cpp
@@ -82,8 +82,8 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off << false;
 
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
-            // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
+            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+            QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
         } else if (Utility::isWindows()) {
             qWarning("Skipping Vfs::WindowsCfApi");
         }
diff --git a/test/testsyncdelete.cpp b/test/testsyncdelete.cpp
index 9b4dbcfae17..3258c119153 100644
--- a/test/testsyncdelete.cpp
+++ b/test/testsyncdelete.cpp
@@ -24,7 +24,7 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off << false;
 
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
             // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp
index 4497f01c574..17b2e47c8e8 100644
--- a/test/testsyncengine.cpp
+++ b/test/testsyncengine.cpp
@@ -51,7 +51,7 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off << false;
 
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
             // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
diff --git a/test/testsyncmove.cpp b/test/testsyncmove.cpp
index 4b0b9463717..9d38221164b 100644
--- a/test/testsyncmove.cpp
+++ b/test/testsyncmove.cpp
@@ -70,7 +70,7 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off << false;
 
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
             // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
@@ -992,7 +992,7 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off;
 #ifdef Q_OS_WIN32
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi") << Vfs::WindowsCfApi;
+            QTest::newRow("Vfs::WindowsCfApi") << Vfs::WindowsCfApi;
         } else {
             qWarning("Skipping Vfs::WindowsCfApi");
         }
diff --git a/test/testuploadreset.cpp b/test/testuploadreset.cpp
index 64cba671c54..9d41fec4b0b 100644
--- a/test/testuploadreset.cpp
+++ b/test/testuploadreset.cpp
@@ -27,7 +27,7 @@ private Q_SLOTS:
         QTest::newRow("Vfs::Off") << Vfs::Off << false;
 
         if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            // QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
             // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;