diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd6e581..bd14c99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-include("test/lib/KUnity/dev-utility/BuildKernelModule.cmake")
+include("dev-utility/CMake-Module/BuildKernelModule/BuildKernelModule.cmake")
 SET(module_name kunity_test_runner_module)
 project (${module_name})
 
@@ -10,35 +10,29 @@ endif()
 
 set(CMAKE_C_FLAGS  "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -pedantic -Weverything")
 
-file(GLOB module_src_files
-    "${PROJECT_SOURCE_DIR}/src/*.h"
-    "${PROJECT_SOURCE_DIR}/src/*.c")
+file(GLOB module_src_files "${PROJECT_SOURCE_DIR}/src/*.c")
 
 include_directories(
-    "${KERNEL_DIR}/include"
     "${PROJECT_SOURCE_DIR}/src"
-    "${PROJECT_SOURCE_DIR}/test/lib/KUnity/src")
+    "${PROJECT_SOURCE_DIR}/lib/KUnity/src")
+
 add_module("${module_name}" "${module_src_files}" "${KERNEL_DIR}")
 
+if(BUILD_TEST_MOUDLE)
 ## test module section
+    Set(TEST_MODULE_SOURCE_DIR  "${PROJECT_BINARY_DIR}/test_${module_name}")
 
-Set(TEST_MODULE_SOURCE_DIR  "${PROJECT_BINARY_DIR}/test_${module_name}")
+    file(GLOB module_test_files
+        ${module_src_files}
+        "${PROJECT_SOURCE_DIR}/test/src/*.c"
+        "${PROJECT_SOURCE_DIR}/lib/KUnity/src/*.c"
+        "${PROJECT_SOURCE_DIR}/lib/KUnity/lib/Unity/src/*.c")
 
-file(GLOB module_test_files
-    ${module_src_files}
-    "${PROJECT_SOURCE_DIR}/test/src/*.c"
-    "${PROJECT_SOURCE_DIR}/test/lib/KUnity/Kbuild"
-    "${PROJECT_SOURCE_DIR}/test/lib/KUnity/src/*.h"
-    "${PROJECT_SOURCE_DIR}/test/lib/KUnity/src/*.c"
-    "${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/fff/fff.h"
-    "${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/Unity/src/*.h"
-    "${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/Unity/src/*.c")
+    include_directories(
+        "${KERNEL_DIR}/include"
+        "${PROJECT_SOURCE_DIR}/test/src"
+        "${PROJECT_SOURCE_DIR}/lib/KUnity/lib/Unity/src")
 
-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")
-
-add_definitions(-DUNITY_INCLUDE_CONFIG_H)
-add_module("test_${module_name}" "${module_test_files}" "${KERNEL_DIR}")
+    add_definitions(-DUNITY_INCLUDE_CONFIG_H)
+    add_module("test_${module_name}" "${module_test_files}" "${KERNEL_DIR}")
+endif()
diff --git a/dev-utility/CMake-Module/BuildKernelModule b/dev-utility/CMake-Module/BuildKernelModule
new file mode 160000
index 0000000..fc86d1e
--- /dev/null
+++ b/dev-utility/CMake-Module/BuildKernelModule
@@ -0,0 +1 @@
+Subproject commit fc86d1e5f7528bb7b7ce4e2e39c027835bda00e9
diff --git a/dev-utility/build_envs/min-build.nix b/dev-utility/build_envs/min-build.nix
new file mode 100644
index 0000000..dfcf403
--- /dev/null
+++ b/dev-utility/build_envs/min-build.nix
@@ -0,0 +1,15 @@
+with import <nixpkgs> {};
+
+stdenv.mkDerivation rec {
+  name = "kttd-buid-env";
+  env = buildEnv { name = name; paths = buildInputs; };
+
+  buildInputs = [
+    gcc
+    cmake
+    elfutils
+  ];
+
+  hardeningDisable = [ "pic" ];
+}
+
diff --git a/lib/KUnity b/lib/KUnity
new file mode 160000
index 0000000..98ffa65
--- /dev/null
+++ b/lib/KUnity
@@ -0,0 +1 @@
+Subproject commit 98ffa6508d4dd8b03b47afd02240173227a2a490