diff --git a/CMakeLists.txt b/CMakeLists.txt
index 887d8d16536e6c00bf68e4690040cdb310ea2b56..1b1adc06a1e956c2219751049f442928c040a9ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,8 @@ if(NOT DEFINED CELLFRAME_MODULES)
         set(CELLFRAME_MODULES "${CELLFRAME_MODULES} srv-vpn")
     endif()
 
+    add_subdirectory(dap-sdk)
+
 endif()
 
 message("Cellframe modules: ${CELLFRAME_MODULES}")
@@ -70,11 +72,6 @@ add_subdirectory(3rdparty/crc32c_adler)             # https://github.com/fonic/c
 include_directories(3rdparty/crc32c_adler)
 set(CELLFRAME_LIBS ${CELLFRAME_LIBS} crc32c_adler)
 
-if(BUILD_TESTS)
-    include(cmake/OS_Detection.cmake)
-    add_subdirectory(dap-sdk)
-endif()
-
 
 if (BUILD_WITH_ZIP)
     add_subdirectory(3rdparty/libzip)