diff --git a/capio-tests/multinode/backend/CMakeLists.txt b/capio-tests/multinode/backend/CMakeLists.txt
index cd83cbea5..636a35359 100644
--- a/capio-tests/multinode/backend/CMakeLists.txt
+++ b/capio-tests/multinode/backend/CMakeLists.txt
@@ -7,6 +7,8 @@ set(TARGET_SOURCES
         src/main.cpp
 )
 
+set(TARGET_INCLUDE_FOLDER "${CMAKE_SOURCE_DIR}/capio-server/")
+
 #####################################
 # Target definition
 #####################################
@@ -24,9 +26,8 @@ target_include_directories(${TARGET_NAME} PRIVATE
 file(GLOB_RECURSE CAPIO_SERVER_SOURCES
         "${CMAKE_SOURCE_DIR}/capio-server/src/communication-service/*.cpp"
 )
-file(GLOB_RECURSE CAPIO_SERVER_HEADERS
-        "${TARGET_INCLUDE_FOLDER}/*.hpp"
-)
+
+file(GLOB_RECURSE CAPIO_SERVER_HEADERS "${TARGET_INCLUDE_FOLDER}/*.hpp")
 
 target_sources(${TARGET_NAME} PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp
diff --git a/capio-tests/unit/server/CMakeLists.txt b/capio-tests/unit/server/CMakeLists.txt
index 0b3215300..7cb56a2da 100644
--- a/capio-tests/unit/server/CMakeLists.txt
+++ b/capio-tests/unit/server/CMakeLists.txt
@@ -17,8 +17,11 @@ file(GLOB_RECURSE CAPIO_SERVER_SOURCES
         "${CMAKE_SOURCE_DIR}/capio-server/src/capio-cl-engine/capio_cl_engine.cpp"
         "${CMAKE_SOURCE_DIR}/capio-server/src/client-manager/client_manager.cpp"
 )
-file(GLOB_RECURSE CAPIO_SERVER_HEADERS "${TARGET_INCLUDE_FOLDER}/*.hpp")
+
 set(TARGET_INCLUDE_FOLDER "${CMAKE_SOURCE_DIR}/capio-server/")
+file(GLOB_RECURSE CAPIO_SERVER_HEADERS "${TARGET_INCLUDE_FOLDER}/*.hpp")
+
+
 target_sources(${TARGET_NAME} PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp
         ${CAPIO_SERVER_SOURCES}