diff --git a/src/keys/drivers/YubiKeyStub.cpp b/src/keys/drivers/YubiKeyStub.cpp
index 81e913b0e..1c2fcb8b6 100644
--- a/src/keys/drivers/YubiKeyStub.cpp
+++ b/src/keys/drivers/YubiKeyStub.cpp
@@ -75,3 +75,10 @@ YubiKey::ChallengeResult YubiKey::challenge(int slot, bool mayBlock, const QByte
 
     return ERROR;
 }
+
+bool YubiKey::checkSlotIsBlocking(int slot, QString& errorMessage)
+{
+    Q_UNUSED(slot);
+    Q_UNUSED(errorMessage);
+    return false;
+}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 288f64470..9aac1b7d8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -87,17 +87,7 @@ macro(add_unit_test)
     endif()
 endmacro(add_unit_test)
 
-set(TEST_LIBRARIES
-        keepassx_core
-        ${keepassxcbrowser_LIB}
-        ${autotype_LIB}
-        Qt5::Core
-        Qt5::Concurrent
-        Qt5::Widgets
-        Qt5::Test
-        ${GCRYPT_LIBRARIES}
-        ${GPGERROR_LIBRARIES}
-        ${ZLIB_LIBRARIES})
+set(TEST_LIBRARIES keepassx_core Qt5::Test)
 
 set(testsupport_SOURCES
         modeltest.cpp
@@ -108,10 +98,6 @@ set(testsupport_SOURCES
 add_library(testsupport STATIC ${testsupport_SOURCES})
 target_link_libraries(testsupport Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Test)
 
-if(YUBIKEY_FOUND)
-    set(TEST_LIBRARIES ${TEST_LIBRARIES} ${YUBIKEY_LIBRARIES})
-endif()
-
 add_unit_test(NAME testgroup SOURCES TestGroup.cpp
         LIBS testsupport ${TEST_LIBRARIES})
 
diff --git a/tests/TestCli.cpp b/tests/TestCli.cpp
index 586c39be1..f1f39e9f5 100644
--- a/tests/TestCli.cpp
+++ b/tests/TestCli.cpp
@@ -21,9 +21,9 @@
 #include "core/Bootstrap.h"
 #include "core/Config.h"
 #include "core/Global.h"
-#include "core/PasswordGenerator.h"
 #include "core/Tools.h"
 #include "crypto/Crypto.h"
+#include "keys/drivers/YubiKey.h"
 #include "format/Kdbx3Reader.h"
 #include "format/Kdbx3Writer.h"
 #include "format/Kdbx4Reader.h"
diff --git a/tests/gui/CMakeLists.txt b/tests/gui/CMakeLists.txt
index 168272bac..6a8d21c4a 100644
--- a/tests/gui/CMakeLists.txt
+++ b/tests/gui/CMakeLists.txt
@@ -16,5 +16,8 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 add_unit_test(NAME testgui SOURCES TestGui.cpp ../util/TemporaryFile.cpp LIBS ${TEST_LIBRARIES})
-add_unit_test(NAME testguibrowser SOURCES TestGuiBrowser.cpp ../util/TemporaryFile.cpp LIBS ${TEST_LIBRARIES})
 add_unit_test(NAME testguipixmaps SOURCES TestGuiPixmaps.cpp LIBS ${TEST_LIBRARIES})
+
+if(WITH_XC_BROWSER)
+    add_unit_test(NAME testguibrowser SOURCES TestGuiBrowser.cpp ../util/TemporaryFile.cpp LIBS ${TEST_LIBRARIES})
+endif()