diff --git a/target_unit_tests/xe_hpc_core/pvc/CMakeLists.txt b/target_unit_tests/xe_hpc_core/pvc/CMakeLists.txt
index 18c50d22b9..35d0dd8ee4 100644
--- a/target_unit_tests/xe_hpc_core/pvc/CMakeLists.txt
+++ b/target_unit_tests/xe_hpc_core/pvc/CMakeLists.txt
@@ -1,9 +1,10 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2024 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_PVC)
-  include(${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}enable_pvc_testing.cmake)
+  set(unit_test_config "pvc/2/4/8/47") # non-zero values for unit tests
+  include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
 endif()
diff --git a/target_unit_tests/xe_hpc_core/pvc/enable_pvc_testing.cmake b/target_unit_tests/xe_hpc_core/pvc/enable_pvc_testing.cmake
deleted file mode 100644
index 35d0dd8ee4..0000000000
--- a/target_unit_tests/xe_hpc_core/pvc/enable_pvc_testing.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (C) 2021-2024 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-if(TESTS_PVC)
-  set(unit_test_config "pvc/2/4/8/47") # non-zero values for unit tests
-  include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
-endif()
diff --git a/target_unit_tests/xe_hpg_core/arl/CMakeLists.txt b/target_unit_tests/xe_hpg_core/arl/CMakeLists.txt
index 87b486bdf6..8fba0134e5 100644
--- a/target_unit_tests/xe_hpg_core/arl/CMakeLists.txt
+++ b/target_unit_tests/xe_hpg_core/arl/CMakeLists.txt
@@ -1,9 +1,10 @@
 #
-# Copyright (C) 2023 Intel Corporation
+# Copyright (C) 2023-2024 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_ARL)
-  include(${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}enable_arl_testing.cmake)
+  set(unit_test_config "arl/2/4/8/0/0x7D41") # non-zero values for unit tests
+  include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
 endif()
diff --git a/target_unit_tests/xe_hpg_core/arl/enable_arl_testing.cmake b/target_unit_tests/xe_hpg_core/arl/enable_arl_testing.cmake
deleted file mode 100644
index 8fba0134e5..0000000000
--- a/target_unit_tests/xe_hpg_core/arl/enable_arl_testing.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (C) 2023-2024 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-if(TESTS_ARL)
-  set(unit_test_config "arl/2/4/8/0/0x7D41") # non-zero values for unit tests
-  include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
-endif()
diff --git a/target_unit_tests/xe_hpg_core/dg2/CMakeLists.txt b/target_unit_tests/xe_hpg_core/dg2/CMakeLists.txt
index f7371c2c2b..33434e6001 100644
--- a/target_unit_tests/xe_hpg_core/dg2/CMakeLists.txt
+++ b/target_unit_tests/xe_hpg_core/dg2/CMakeLists.txt
@@ -1,9 +1,10 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2024 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_DG2)
-  include(${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}enable_dg2_testing.cmake)
+  set(unit_test_config "dg2/2/4/8/0/0x4F80") # non-zero values for unit tests
+  include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
 endif()
diff --git a/target_unit_tests/xe_hpg_core/dg2/enable_dg2_testing.cmake b/target_unit_tests/xe_hpg_core/dg2/enable_dg2_testing.cmake
deleted file mode 100644
index 6241a3095a..0000000000
--- a/target_unit_tests/xe_hpg_core/dg2/enable_dg2_testing.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (C) 2021-2024 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-if(TESTS_DG2)
-  set(unit_test_config "dg2/2/4/5/0/0x4F80") # non-zero values for unit tests
-  include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
-endif()
diff --git a/target_unit_tests/xe_hpg_core/mtl/CMakeLists.txt b/target_unit_tests/xe_hpg_core/mtl/CMakeLists.txt
index b373254059..3fa8eaf2f2 100644
--- a/target_unit_tests/xe_hpg_core/mtl/CMakeLists.txt
+++ b/target_unit_tests/xe_hpg_core/mtl/CMakeLists.txt
@@ -1,9 +1,10 @@
 #
-# Copyright (C) 2022 Intel Corporation
+# Copyright (C) 2022-2024 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_MTL)
-  include(${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}enable_mtl_testing.cmake)
+  set(unit_test_config "mtl/2/4/8/0/0x7D40") # non-zero values for unit tests
+  include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
 endif()
diff --git a/target_unit_tests/xe_hpg_core/mtl/enable_mtl_testing.cmake b/target_unit_tests/xe_hpg_core/mtl/enable_mtl_testing.cmake
deleted file mode 100644
index 3fa8eaf2f2..0000000000
--- a/target_unit_tests/xe_hpg_core/mtl/enable_mtl_testing.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (C) 2022-2024 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-if(TESTS_MTL)
-  set(unit_test_config "mtl/2/4/8/0/0x7D40") # non-zero values for unit tests
-  include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
-endif()