diff --git a/src/libsync/vfs/CMakeLists.txt b/src/libsync/vfs/CMakeLists.txt
index d2aa9abcc..ee1d1dbb4 100644
--- a/src/libsync/vfs/CMakeLists.txt
+++ b/src/libsync/vfs/CMakeLists.txt
@@ -1,14 +1,16 @@
-list(APPEND vfsPlugins "suffix")
-if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/win")
-    list(APPEND vfsPlugins "win")
-endif()
+file(GLOB vfsPlugins RELATIVE ${CMAKE_CURRENT_LIST_DIR} "*")
 
 foreach(vfsPlugin ${vfsPlugins})
-    message(STATUS "Add vfsPlugin in dir: ${vfsPlugin}")
+    if(NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/${vfsPlugin}")
+        continue()
+    endif()
+
     add_subdirectory("${vfsPlugin}")
 
     if(UNIT_TESTING AND IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/${vfsPlugin}/test")
-        message(STATUS "Add vfsPlugin tests in dir: ${vfsPlugin}")
         add_subdirectory("${vfsPlugin}/test" "${vfsPlugin}_test")
+        message(STATUS "Added vfsPlugin with tests: ${vfsPlugin}")
+    else()
+        message(STATUS "Added vfsPlugin without tests: ${vfsPlugin}")
     endif()
 endforeach()
diff --git a/test/nextcloud_add_test.cmake b/test/nextcloud_add_test.cmake
index 24e6a5b5d..1cfeec832 100644
--- a/test/nextcloud_add_test.cmake
+++ b/test/nextcloud_add_test.cmake
@@ -21,7 +21,6 @@ macro(nextcloud_add_test test_class additional_cpp)
 
     add_definitions(-DOWNCLOUD_TEST)
     add_definitions(-DOWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
-    message(STATUS "Add test: ${OWNCLOUD_TEST_CLASS}Test")
     add_test(NAME ${OWNCLOUD_TEST_CLASS}Test
         COMMAND ${OWNCLOUD_TEST_CLASS}Test
         WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin")