diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5012635d3a..697eb3b745 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -553,9 +553,7 @@ if(NOT DEFINED INSTANCES_ONLY)
         PACKAGE_NAME examples
    )
    add_subdirectory(example)
-   if(BUILD_TESTING)
-      add_subdirectory(test)
-   endif()
+   add_subdirectory(test)
 
    rocm_package_setup_component(profiler
         LIBRARY_NAME composablekernel
diff --git a/codegen/CMakeLists.txt b/codegen/CMakeLists.txt
index 1d8167b4be..3b3e9f06ee 100644
--- a/codegen/CMakeLists.txt
+++ b/codegen/CMakeLists.txt
@@ -50,6 +50,4 @@ rocm_install(
 )
 rocm_install(DIRECTORY include/ck DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
-if(BUILD_TESTING)
 add_subdirectory(test)
-endif()
diff --git a/codegen/test/CMakeLists.txt b/codegen/test/CMakeLists.txt
index e943d4ff5b..3ca3f39a30 100644
--- a/codegen/test/CMakeLists.txt
+++ b/codegen/test/CMakeLists.txt
@@ -12,7 +12,7 @@ if(NOT INSTANCES_ONLY)
     add_test(NAME codegen_test_${BASE_NAME} COMMAND codegen_test_${BASE_NAME})
     message("adding test codegen_test_${BASE_NAME}")
     target_link_libraries(codegen_test_${BASE_NAME} ck_rtc ck_host)
-    target_include_directories(codegen_test_${BASE_NAME} PUBLIC include())
+    target_include_directories(codegen_test_${BASE_NAME} PUBLIC ${CK_ROOT}/codegen/test/include)
     target_include_directories(codegen_test_${BASE_NAME} PUBLIC ${CK_ROOT}/include)
     target_include_directories(codegen_test_${BASE_NAME} PUBLIC ${CK_ROOT}/library/include)
   endforeach()