diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e9f3d548..5b57f48f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -71,7 +71,10 @@ if(YAZE_BUILD_APP OR YAZE_BUILD_Z3ED OR YAZE_BUILD_TESTS)
   include(cli/agent.cmake)
 endif()
 
-if(YAZE_BUILD_TESTS AND NOT YAZE_MINIMAL_BUILD)
+# Include test support library when tests are enabled OR in non-minimal builds
+# (yaze_editor needs TestManager for editor features)
+# Test executables are only built when YAZE_BUILD_TESTS=ON (handled in test/CMakeLists.txt)
+if(YAZE_BUILD_TESTS OR NOT YAZE_MINIMAL_BUILD)
   include(app/test/test.cmake)
 endif()
 
diff --git a/src/app/app.cmake b/src/app/app.cmake
index 47a47f5a..2cca28c2 100644
--- a/src/app/app.cmake
+++ b/src/app/app.cmake
@@ -41,14 +41,12 @@ target_link_libraries(yaze PRIVATE
   absl::flags_parse
 )
 
-# Link test support if tests are enabled (yaze_editor needs TestManager)
-if(YAZE_BUILD_TESTS AND TARGET yaze_test_support)
+# Link test support library (yaze_editor needs TestManager)
+if(TARGET yaze_test_support)
   target_link_libraries(yaze PRIVATE yaze_test_support)
   message(STATUS "✓ yaze executable linked to yaze_test_support")
 else()
-  if(YAZE_BUILD_TESTS)
-    message(WARNING "yaze needs yaze_test_support but TARGET yaze_test_support not found")
-  endif()
+  message(WARNING "yaze needs yaze_test_support but TARGET not found")
 endif()
 
 # Platform-specific settings
diff --git a/src/app/emu/emu.cmake b/src/app/emu/emu.cmake
index 733463dd..48c12d88 100644
--- a/src/app/emu/emu.cmake
+++ b/src/app/emu/emu.cmake
@@ -26,9 +26,12 @@ if(YAZE_BUILD_EMU AND NOT YAZE_MINIMAL_BUILD)
     absl::failure_signal_handler
   )
 
-  # Link test support if tests are enabled (yaze_editor needs TestManager)
-  if(YAZE_BUILD_TESTS AND TARGET yaze_test_support)
+  # Link test support library (yaze_editor needs TestManager)
+  if(TARGET yaze_test_support)
     target_link_libraries(yaze_emu PRIVATE yaze_test_support)
+    message(STATUS "✓ yaze_emu executable linked to yaze_test_support")
+  else()
+    message(WARNING "yaze_emu needs yaze_test_support but TARGET not found")
   endif()
 
   if(YAZE_ENABLE_UI_TESTS)