diff --git a/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt
index 5dde61872..adae0acc9 100644
--- a/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt
@@ -37,6 +37,7 @@ if(BUILD_TESTING)
             ${CMAKE_SOURCE_DIR}/include
             ${CMAKE_SOURCE_DIR}/qt6-after/qt6-migrated-legatus
             ${CMAKE_SOURCE_DIR}/qt6-after/qt6-migrated-legatus/include
+            ${CMAKE_BINARY_DIR}/Lts/Common
         )
         
         # Link against Qt6 components
@@ -48,6 +49,28 @@ if(BUILD_TESTING)
             GTest::gtest_main
         )
         
+        # Grantlee tests require BUILD_GRANTLEE=ON
+        if(BUILD_GRANTLEE)
+            target_link_libraries(migration_tests PRIVATE codegen_grantlee)
+            target_include_directories(migration_tests PRIVATE
+                ${CMAKE_SOURCE_DIR}/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen
+            )
+            message(STATUS "Migration tests: Grantlee support enabled")
+        else()
+            # Exclude Grantlee-related tests when BUILD_GRANTLEE is OFF
+            list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_.*Grantlee.*\\.cpp")
+            message(STATUS "Migration tests: Grantlee support disabled (BUILD_GRANTLEE=OFF), excluded Grantlee tests")
+            # Re-create executable with filtered sources
+            if(EXISTING_SOURCES)
+                set_target_properties(migration_tests PROPERTIES
+                    SOURCES "${EXISTING_SOURCES}"
+                )
+            else()
+                message(WARNING "No non-Grantlee migration tests found - skipping migration_tests target")
+                return()
+            endif()
+        endif()
+        
         # RTI libraries if BUILD_RTI is ON
         if(BUILD_RTI)
             find_package(RTI QUIET)