diff --git a/cmake/generic/modules/AddGTest.cmake b/cmake/generic/modules/AddGTest.cmake
index 155c332738518f35cb42086a84975c6a1d2dc712..755592a0a07ecba2f1dce2f8e92dd1a167a45cd5 100644
--- a/cmake/generic/modules/AddGTest.cmake
+++ b/cmake/generic/modules/AddGTest.cmake
@@ -22,8 +22,8 @@ MACRO(ADD_GTEST project subdir libs stage)
     set(TEST_NAME ${project}UnitTest${subdir})
     set(EXE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_NAME})
     file(GLOB include_files ${subdir}/*.h)
-    include_directories(${subdir})
     add_executable(${TEST_NAME} ${subdir}/../../utilities/main_testlist.cpp ${include_files})
+    target_include_directories(${TEST_NAME} PUBLIC ${subdir})
     target_link_libraries(${TEST_NAME} gtest ${libs})
     if    (${stage} EQUAL 0)
         # Execute test just after compilation