diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 343c23523..a39da386d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -15,7 +15,10 @@ include_directories(${CMAKE_SOURCE_DIR}/src
 include(nextcloud_add_test.cmake)
 
 nextcloud_add_test(NextcloudPropagator "")
-nextcloud_add_test(Updater "")
+
+IF(BUILD_UPDATER)
+    nextcloud_add_test(Updater "")
+endif()
 
 SET(FolderWatcher_SRC ../src/gui/folderwatcher.cpp)
 
diff --git a/test/nextcloud_add_test.cmake b/test/nextcloud_add_test.cmake
index 234eb2d79..552c28479 100644
--- a/test/nextcloud_add_test.cmake
+++ b/test/nextcloud_add_test.cmake
@@ -9,11 +9,16 @@ macro(nextcloud_add_test test_class additional_cpp)
     set_target_properties(${OWNCLOUD_TEST_CLASS}Test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY})
 
     target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
-        updater
         ${APPLICATION_EXECUTABLE}sync
         Qt5::Core Qt5::Test Qt5::Xml Qt5::Network Qt5::Qml Qt5::Quick
     )
 
+    IF(BUILD_UPDATER)
+        target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
+            updater
+        )
+    endif()
+
     add_definitions(-DOWNCLOUD_TEST)
     add_definitions(-DOWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
     add_test(NAME ${OWNCLOUD_TEST_CLASS}Test COMMAND ${OWNCLOUD_TEST_CLASS}Test)
@@ -28,11 +33,16 @@ macro(nextcloud_add_benchmark test_class additional_cpp)
     set_target_properties(${OWNCLOUD_TEST_CLASS}Bench PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY})
 
     target_link_libraries(${OWNCLOUD_TEST_CLASS}Bench
-        updater
         ${APPLICATION_EXECUTABLE}sync
         Qt5::Core Qt5::Test Qt5::Xml Qt5::Network
     )
 
+    IF(BUILD_UPDATER)
+        target_link_libraries(${OWNCLOUD_TEST_CLASS}Bench
+            updater
+        )
+    endif()
+
     add_definitions(-DOWNCLOUD_TEST)
     add_definitions(-DOWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
 endmacro()