diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2f10664..508c18b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,9 +54,7 @@ set(YAZE_INSTALL_LIB OFF)
 
 # Testing and CI Configuration
 option(YAZE_ENABLE_ROM_TESTS "Enable tests that require ROM files" OFF)
-option(YAZE_ENABLE_EXPERIMENTAL_TESTS "Enable experimental/unstable tests" ON)
 option(YAZE_MINIMAL_BUILD "Minimal build for CI (disable optional features)" OFF)
-option(YAZE_USE_MODULAR_BUILD "Use modularized library build system for faster builds" ON)
 option(YAZE_UNITY_BUILD "Enable Unity (Jumbo) builds" OFF)
 
 # Feature Flags - Simplified: Always enabled by default (use wrapper classes to hide complexity)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7a97584e..3491c31d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -39,7 +39,8 @@ if(YAZE_BUILD_TESTS)
       target_link_libraries(${suite_name} PRIVATE ImGuiTestEngine)
       target_compile_definitions(${suite_name} PRIVATE 
         IMGUI_ENABLE_TEST_ENGINE=1 
-        IMGUI_TEST_ENGINE_ENABLE_COROUTINE_STDTHREAD_IMPL=1)
+        IMGUI_TEST_ENGINE_ENABLE_COROUTINE_STDTHREAD_IMPL=1
+        YAZE_GUI_TEST_TARGET=1)  # Mark this as a GUI test target
     endif()
 
     if(WIN32)
diff --git a/test/yaze_test.cc b/test/yaze_test.cc
index 28f0db36..5c07ee6d 100644
--- a/test/yaze_test.cc
+++ b/test/yaze_test.cc
@@ -311,19 +311,19 @@ int main(int argc, char* argv[]) {
     else if (config.test_speed == ImGuiTestRunSpeed_Cinematic) speed_name = "Cinematic";
     std::cout << "Running tests in " << speed_name << " mode" << std::endl;
     
-    // Register smoke test
+    // Register E2E tests only for GUI test targets (they have the source files)
+#ifdef YAZE_GUI_TEST_TARGET
     ImGuiTest* smoke_test = IM_REGISTER_TEST(engine, "E2ETest", "FrameworkSmokeTest");
     smoke_test->TestFunc = E2ETest_FrameworkSmokeTest;
 
-    // Register canvas selection test
     ImGuiTest* canvas_test = IM_REGISTER_TEST(engine, "E2ETest", "CanvasSelectionTest");
     canvas_test->TestFunc = E2ETest_CanvasSelectionTest;
     canvas_test->UserData = &controller;
     
-    // Register dungeon editor smoke test
     ImGuiTest* dungeon_test = IM_REGISTER_TEST(engine, "E2ETest", "DungeonEditorSmokeTest");
     dungeon_test->TestFunc = E2ETest_DungeonEditorV2SmokeTest;
     dungeon_test->UserData = &controller;
+#endif
 
     // Main loop
     bool done = false;