diff --git a/debuggers/common/CMakeLists.txt b/debuggers/common/CMakeLists.txt
index 03a599347e..83dc250cd6 100644
--- a/debuggers/common/CMakeLists.txt
+++ b/debuggers/common/CMakeLists.txt
@@ -1,85 +1,87 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"kdevdebuggercommon\")
 set(debuggercommon_SRCS
     mi/mi.cpp
     mi/milexer.cpp
     mi/miparser.cpp
     mi/micommand.cpp
     mi/micommandqueue.cpp
     dialogs/selectcoredialog.cpp
     # debug session & debugger
     midebugger.cpp
     midebugsession.cpp
     midebuggerplugin.cpp
     midebugjobs.cpp
     # controllers
     mibreakpointcontroller.cpp
     miframestackmodel.cpp
     mivariablecontroller.cpp
     mivariable.cpp
     stringhelpers.cpp
     stty.cpp
     # tool views
     widgets/debuggerconsoleview.cpp
     widgets/disassemblewidget.cpp
     # register
     registers/registersview.cpp
     registers/registercontroller.cpp
     registers/registersmanager.cpp
     registers/registercontroller_x86.cpp
     registers/registercontroller_arm.cpp
     registers/modelsmanager.cpp
     registers/converters.cpp
 )
 if(KF5SysGuard_FOUND)
     list(APPEND debuggercommon_SRCS
         dialogs/processselection.cpp
     )
 endif()
 
 ecm_qt_declare_logging_category(debuggercommon_SRCS
     HEADER debuglog.h
     IDENTIFIER DEBUGGERCOMMON
     CATEGORY_NAME "kdevelop.debuggers.common"
 )
 
 ki18n_wrap_ui(debuggercommon_SRCS
     dialogs/selectcoredialog.ui
     widgets/debuggerconsoleview.ui
     widgets/selectaddressdialog.ui
     registers/registersview.ui
 )
 
 # Use old behavior (ignore the visibility properties for static libraries, object
 # libraries, and executables without exports) on target kdevdebuggercommon (so the
 # default public visibility is used).
 # kdevdebuggercommon is used by target test_gdb which is added by ecm_add_test,
 # which doesn't set CMP0063 so old behavior is used.
 # If kdevdebuggercommon honors visibility properties (set to hidden), it will cause
 # linker warnings about direct access to global weak symbol when link against test_gdb
 if(NOT CMAKE_VERSION VERSION_LESS "3.3")
     cmake_policy(SET CMP0063 OLD)
 endif()
 
 add_library(kdevdebuggercommon STATIC ${debuggercommon_SRCS})
 target_link_libraries(kdevdebuggercommon
     PUBLIC
     KDev::Debugger
     KDev::OutputView
     KDev::Sublime
     PRIVATE
     Qt5::Core
     Qt5::Gui
     Qt5::Widgets
     KDev::Util
     KDev::Language
 )
 if(KF5SysGuard_FOUND)
     target_link_libraries(kdevdebuggercommon
         PUBLIC
         KF5::ProcessUi
     )
 endif()
 
 kde_target_enable_exceptions(kdevdebuggercommon PUBLIC)
 
-add_subdirectory(tests)
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+endif()