diff --git a/CMakeLists.txt b/CMakeLists.txt
index 748c149..f873ff5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,11 @@ file(GLOB module_src_files
     "${PROJECT_SOURCE_DIR}/src/*.h"
     "${PROJECT_SOURCE_DIR}/src/*.c")
 
-set(modules_includes
-    "${KERNEL_DIR}/include" "${PROJECT_SOURCE_DIR}/src"
+include_directories(
+    "${KERNEL_DIR}/include"
+    "${PROJECT_SOURCE_DIR}/src"
     "${PROJECT_SOURCE_DIR}/test/lib/KUnity/src")
-add_module("${module_name}" "${module_src_files}" "${modules_includes}" "" "${KERNEL_DIR}")
+add_module("${module_name}" "${module_src_files}" "${KERNEL_DIR}")
 
 ## test module section
 
@@ -32,22 +33,11 @@ file(GLOB module_test_files
     "${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/Unity/src/*.h"
     "${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/Unity/src/*.c")
 
-file(GLOB test_modules_includes
-    ${modules_includes}
+include_directories(
     "${PROJECT_SOURCE_DIR}/test/src"
     "${PROJECT_SOURCE_DIR}/test/lib/KUnity/src"
     "${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/fff"
     "${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/Unity/src")
 
-set(test_modules_definitions -DUNITY_INCLUDE_CONFIG_H)
-add_module("test_${module_name}" "${module_test_files}" "${test_modules_includes}" "${test_modules_definitions}" "${KERNEL_DIR}")
-
-get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
-foreach(dir ${dirs})
-  message(STATUS "dir='${dir}'")
-endforeach()
-
-get_property(defs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_DEFINITIONS)
-foreach(def ${defs})
-  message(STATUS "def='${def}'")
-endforeach()
+add_definitions(-DUNITY_INCLUDE_CONFIG_H)
+add_module("test_${module_name}" "${module_test_files}" "${KERNEL_DIR}")
diff --git a/test/lib/KUnity b/test/lib/KUnity
index ec3f646..686d7c8 160000
--- a/test/lib/KUnity
+++ b/test/lib/KUnity
@@ -1 +1 @@
-Subproject commit ec3f646c5baf1d74e6bc3de24bb31cbbd368f99f
+Subproject commit 686d7c86b7c32d8ba9151c6d162a20c7738e00d2