diff --git a/level_zero/cmake/l0_tests.cmake b/level_zero/cmake/l0_tests.cmake
index 2d621488aa..7bb8e73c56 100644
--- a/level_zero/cmake/l0_tests.cmake
+++ b/level_zero/cmake/l0_tests.cmake
@@ -37,6 +37,7 @@ if(TESTS_GEN12LP)
         ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen12lp.cpp
         ${NEO_SHARED_TEST_DIRECTORY}/unit_test/gen12lp/cmd_parse_gen12lp.cpp
     )
+    include_directories(${NEO_SHARED_TEST_DIRECTORY}/unit_test/gen12lp/cmd_parse${BRANCH_DIR_SUFFIX}/)
 endif()
 
 ## ULT related settings
diff --git a/level_zero/core/source/gen12lp/cmdlist_gen12lp.h b/level_zero/core/source/gen12lp/cmdlist_gen12lp.h
index 512aca778d..2809c7e906 100644
--- a/level_zero/core/source/gen12lp/cmdlist_gen12lp.h
+++ b/level_zero/core/source/gen12lp/cmdlist_gen12lp.h
@@ -10,8 +10,6 @@
 #include "level_zero/core/source/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist_hw_immediate.h"
 
-#include "cache_flush_gen12lp.inl"
-
 namespace L0 {
 
 template <PRODUCT_FAMILY productFamily>
diff --git a/level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp b/level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp
index 8e125c9574..972b1dd0b7 100644
--- a/level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp
+++ b/level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp
@@ -13,6 +13,7 @@
 #include "level_zero/core/source/cmdlist_hw_immediate.inl"
 #include "level_zero/core/source/gen12lp/cmdlist_gen12lp.h"
 
+#include "cache_flush_gen12lp.inl"
 #include "cmdlist_extended.inl"
 #include "igfxfmid.h"
 
diff --git a/level_zero/core/test/unit_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/CMakeLists.txt
index fe0dfcf30b..e13001da2c 100644
--- a/level_zero/core/test/unit_tests/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/CMakeLists.txt
@@ -10,8 +10,6 @@ set(TARGET_NAME ${TARGET_NAME_L0}_core_tests)
 
 append_sources_from_properties(L0_CORE_ENABLERS NEO_CORE_SRCS_LINK)
 
-append_sources_from_properties(L0_SCRS_FROM_PROPERTIES
-)
 add_executable(${TARGET_NAME}
     ${NEO_SOURCE_DIR}/level_zero/core/source/dll/disallow_deferred_deleter.cpp
     ${NEO_SOURCE_DIR}/level_zero/core/source/debug_manager.cpp
@@ -23,7 +21,6 @@ add_executable(${TARGET_NAME}
     ${NEO_SOURCE_DIR}/shared/test/unit_test/helpers/memory_management.cpp
     ${NEO_SOURCE_DIR}/shared/test/unit_test/helpers/memory_leak_listener.h
     ${NEO_SOURCE_DIR}/shared/test/unit_test/helpers/memory_leak_listener.cpp
-    ${L0_SCRS_FROM_PROPERTIES}
     ${L0_CORE_ENABLERS}
 )
 
@@ -156,6 +153,6 @@ if(NOT GTEST_SHUFFLE)
 endif()
 message(STATUS "GTest shuffle set to ${GTEST_SHUFFLE}")
 
-add_subdirectory(sources)
+add_subdirectoriesL0(${CMAKE_CURRENT_SOURCE_DIR} "*")
 
 create_source_tree(${TARGET_NAME} ${L0_ROOT_DIR}/..)
diff --git a/level_zero/core/test/unit_tests/gen11/CMakeLists.txt b/level_zero/core/test/unit_tests/gen11/CMakeLists.txt
index 8b3e326c78..64619419de 100644
--- a/level_zero/core/test/unit_tests/gen11/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/gen11/CMakeLists.txt
@@ -5,11 +5,8 @@
 #
 
 if(TESTS_GEN11)
-  append_sources_from_properties(HW_SOURCES_GEN11 L0_HW_SOURCES_GEN11)
-
   target_sources(${TARGET_NAME} PRIVATE
     ${COMPUTE_RUNTIME_ULT_GEN11}
-    ${HW_SOURCES_GEN11}
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    )
+  )
 endif()
\ No newline at end of file
diff --git a/level_zero/core/test/unit_tests/gen12lp/CMakeLists.txt b/level_zero/core/test/unit_tests/gen12lp/CMakeLists.txt
index 22905b219b..838c36cf16 100644
--- a/level_zero/core/test/unit_tests/gen12lp/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/gen12lp/CMakeLists.txt
@@ -5,13 +5,10 @@
 #
 
 if(TESTS_GEN12LP)
-  append_sources_from_properties(HW_SOURCES_GEN12LP L0_HW_SOURCES_GEN12LP)
-
   target_sources(${TARGET_NAME} PRIVATE
     ${COMPUTE_RUNTIME_ULT_GEN12LP}
-    ${HW_SOURCES_GEN12LP}
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   )
 
-  add_subdirectoriesL0(${CMAKE_CURRENT_SOURCE_DIR} "*")
+  target_include_directories(${TARGET_NAME} PRIVATE ${COMPUTE_RUNTIME_DIR}/level_zero/core/source/gen12lp/definitions${BRANCH_DIR_SUFFIX}/)
 endif()
\ No newline at end of file
diff --git a/level_zero/core/test/unit_tests/gen8/CMakeLists.txt b/level_zero/core/test/unit_tests/gen8/CMakeLists.txt
index 1793c0c011..62f999eeff 100644
--- a/level_zero/core/test/unit_tests/gen8/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/gen8/CMakeLists.txt
@@ -5,11 +5,8 @@
 #
 
 if(TESTS_GEN8)
-  append_sources_from_properties(HW_SOURCES_GEN8 L0_HW_SOURCES_GEN8)
-
   target_sources(${TARGET_NAME} PRIVATE
     ${COMPUTE_RUNTIME_ULT_GEN8}
-    ${HW_SOURCES_GEN8}
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    )
+  )
 endif()
\ No newline at end of file
diff --git a/level_zero/core/test/unit_tests/gen9/CMakeLists.txt b/level_zero/core/test/unit_tests/gen9/CMakeLists.txt
index 49b2285b92..dfcb4af4fa 100644
--- a/level_zero/core/test/unit_tests/gen9/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/gen9/CMakeLists.txt
@@ -5,12 +5,8 @@
 #
 
 if(TESTS_GEN9)
-  append_sources_from_properties(HW_SOURCES_GEN9 L0_HW_SOURCES_GEN9)
-
   target_sources(${TARGET_NAME} PRIVATE
     ${COMPUTE_RUNTIME_ULT_GEN9}
-    ${HW_SOURCES_GEN9}
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-
-    add_subdirectoriesL0(${CMAKE_CURRENT_SOURCE_DIR} "*")
+  )
 endif()