diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d42c1ae..f8d8c89 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -55,9 +55,11 @@ add_custom_command(
           ${CMAKE_CURRENT_LIST_DIR}/threadx/generate_trap_file.sh
   VERBATIM
 )
+add_custom_target(threadx_regression_generated_trap DEPENDS ${MOONLIGHT_TRAP_SOURCE})
 set_source_files_properties(${MOONLIGHT_TRAP_SOURCE} PROPERTIES GENERATED TRUE)
 
 add_subdirectory(${THREADX4TGFS_ROOT}/port/moonlight ${CMAKE_BINARY_DIR}/port/moonlight)
+add_dependencies(moonlight_platform_common threadx_regression_generated_trap)
 
 function(setup_target TARGET)
   set(options)
diff --git a/test/threadx/CMakeLists.txt b/test/threadx/CMakeLists.txt
index ae9a56b..6264350 100644
--- a/test/threadx/CMakeLists.txt
+++ b/test/threadx/CMakeLists.txt
@@ -11,12 +11,15 @@ set(TX_KERNEL_SETUP_TEST_SOURCE ${CMAKE_BINARY_DIR}/generated/threadx_initialize
 add_custom_command(
     OUTPUT ${TX_KERNEL_SETUP_TEST_SOURCE}
     COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/generate_kernel_setup_test_file.sh
-            ${TX_KERNEL_SETUP_TEST_SOURCE_INPUT}
-            ${TX_KERNEL_SETUP_TEST_SOURCE}
+    ${TX_KERNEL_SETUP_TEST_SOURCE_INPUT}
+    ${TX_KERNEL_SETUP_TEST_SOURCE}
     DEPENDS ${TX_KERNEL_SETUP_TEST_SOURCE_INPUT}
-            ${CMAKE_CURRENT_LIST_DIR}/generate_kernel_setup_test_file.sh
+    ${CMAKE_CURRENT_LIST_DIR}/generate_kernel_setup_test_file.sh
     VERBATIM
 )
+add_custom_target(threadx_regression_generated_kernel_setup_test
+    DEPENDS ${TX_KERNEL_SETUP_TEST_SOURCE}
+)
 set_source_files_properties(${TX_KERNEL_SETUP_TEST_SOURCE} PROPERTIES GENERATED TRUE)
 
 set(TX_REGRESSION_CASES
@@ -150,6 +153,10 @@ function(add_threadx_regression_test TEST_SOURCE)
         SOURCES ${TEST_SOURCE}
     )
 
+    if(TEST_NAME STREQUAL "threadx_initialize_kernel_setup_test")
+        add_dependencies(${TEST_NAME} threadx_regression_generated_kernel_setup_test)
+    endif()
+
     list(APPEND TX_REGRESSION_TARGETS ${TEST_NAME})
     set(TX_REGRESSION_TARGETS ${TX_REGRESSION_TARGETS} PARENT_SCOPE)
 
@@ -172,7 +179,7 @@ function(add_threadx_regression_test TEST_SOURCE)
             $<TARGET_FILE:${TEST_NAME}>
         )
     endif()
-    set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT 5)
+    set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT 10)
 endfunction()
 
 foreach(test_case ${TX_REGRESSION_CASES})