diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt
index fd20310a5b..0d1c8402c0 100644
--- a/level_zero/core/test/aub_tests/CMakeLists.txt
+++ b/level_zero/core/test/aub_tests/CMakeLists.txt
@@ -12,7 +12,7 @@ set(L0_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 list(APPEND L0_AUB_TESTS__TARGET_OBJECTS
      ${CMAKE_CURRENT_SOURCE_DIR}/aub_hello_world_test.cpp
      ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/main.cpp
-     ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
+     ${NEO_SHARED_TEST_DIRECTORY}/common/tests_configuration.h
 )
 
 function(ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION)
diff --git a/level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp b/level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp
index 091b8a3e71..4babd0e42b 100644
--- a/level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp
+++ b/level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp
@@ -10,7 +10,7 @@
 #include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/test/common/mocks/mock_device.h"
-#include "shared/test/unit_test/tests_configuration.h"
+#include "shared/test/common/tests_configuration.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue.h"
 #include "level_zero/core/source/context/context_imp.h"
diff --git a/level_zero/core/test/unit_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/CMakeLists.txt
index e4a50c84fa..8c5bb639a6 100644
--- a/level_zero/core/test/unit_tests/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/CMakeLists.txt
@@ -28,7 +28,7 @@ target_sources(${TARGET_NAME} PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/mock.h
                ${CMAKE_CURRENT_SOURCE_DIR}/white_box.h
-               ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
+               ${NEO_SHARED_TEST_DIRECTORY}/common/tests_configuration.h
                ${NEO_SOURCE_DIR}/level_zero/core/test/common/gen_kernel.cmake
 )
 
diff --git a/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp
index 32b13a3f92..ea013591e6 100644
--- a/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp
+++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp
@@ -8,9 +8,9 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 
 #include "shared/source/os_interface/device_factory.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_context.h"
diff --git a/level_zero/core/test/unit_tests/main.cpp b/level_zero/core/test/unit_tests/main.cpp
index ca75a446c1..e373eb3e85 100644
--- a/level_zero/core/test/unit_tests/main.cpp
+++ b/level_zero/core/test/unit_tests/main.cpp
@@ -12,6 +12,7 @@
 #include "shared/source/program/kernel_info.h"
 #include "shared/source/utilities/debug_settings_reader.h"
 #include "shared/source/utilities/logger.h"
+#include "shared/test/common/base_ult_config_listener.h"
 #include "shared/test/common/helpers/custom_event_listener.h"
 #include "shared/test/common/helpers/default_hw_info.inl"
 #include "shared/test/common/helpers/memory_leak_listener.h"
@@ -21,8 +22,7 @@
 #include "shared/test/common/libult/signal_utils.h"
 #include "shared/test/common/mocks/mock_gmm_client_context.h"
 #include "shared/test/common/mocks/mock_sip.h"
-#include "shared/test/unit_test/base_ult_config_listener.h"
-#include "shared/test/unit_test/test_stats.h"
+#include "shared/test/common/test_stats.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/core/source/compiler_interface/l0_reg_path.h"
diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp
index 7cd80b0dc7..9225b5286e 100644
--- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp
+++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp
@@ -10,9 +10,9 @@
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
 #include "level_zero/core/source/event/event.h"
diff --git a/level_zero/core/test/unit_tests/sources/context/context_drm/test_context.cpp b/level_zero/core/test/unit_tests/sources/context/context_drm/test_context.cpp
index cbd2e3aa52..835307a47b 100644
--- a/level_zero/core/test/unit_tests/sources/context/context_drm/test_context.cpp
+++ b/level_zero/core/test/unit_tests/sources/context/context_drm/test_context.cpp
@@ -7,11 +7,11 @@
 
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_compilers.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_svm_manager.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
 #include "level_zero/core/source/context/context_imp.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
diff --git a/level_zero/core/test/unit_tests/sources/context/context_drm_or_wddm/test_context.cpp b/level_zero/core/test/unit_tests/sources/context/context_drm_or_wddm/test_context.cpp
index 8ed9f32004..e2fbab4508 100644
--- a/level_zero/core/test/unit_tests/sources/context/context_drm_or_wddm/test_context.cpp
+++ b/level_zero/core/test/unit_tests/sources/context/context_drm_or_wddm/test_context.cpp
@@ -7,12 +7,12 @@
 
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_compilers.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_driver_model.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_svm_manager.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
 #include "level_zero/core/source/context/context_imp.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
diff --git a/level_zero/core/test/unit_tests/sources/context/context_wddm/test_context.cpp b/level_zero/core/test/unit_tests/sources/context/context_wddm/test_context.cpp
index 00c8ecd8f3..480542139f 100644
--- a/level_zero/core/test/unit_tests/sources/context/context_wddm/test_context.cpp
+++ b/level_zero/core/test/unit_tests/sources/context/context_wddm/test_context.cpp
@@ -7,11 +7,11 @@
 
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_compilers.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_svm_manager.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
 #include "level_zero/core/source/context/context_imp.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
diff --git a/level_zero/core/test/unit_tests/sources/context/test_context.cpp b/level_zero/core/test/unit_tests/sources/context/test_context.cpp
index 97975f0480..bc531b0623 100644
--- a/level_zero/core/test/unit_tests/sources/context/test_context.cpp
+++ b/level_zero/core/test/unit_tests/sources/context/test_context.cpp
@@ -7,11 +7,11 @@
 
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_compilers.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_svm_manager.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue.h"
 #include "level_zero/core/source/context/context_imp.h"
diff --git a/level_zero/experimental/test/unit_tests/CMakeLists.txt b/level_zero/experimental/test/unit_tests/CMakeLists.txt
index a71e9bbf7f..0957595878 100644
--- a/level_zero/experimental/test/unit_tests/CMakeLists.txt
+++ b/level_zero/experimental/test/unit_tests/CMakeLists.txt
@@ -36,7 +36,7 @@ target_sources(
                ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/main.cpp
                ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/mock.h
                ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/white_box.h
-               ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
+               ${NEO_SHARED_TEST_DIRECTORY}/common/tests_configuration.h
 )
 
 target_sources(
diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt
index 0a84fa5d6b..5ff28a86c1 100644
--- a/level_zero/tools/test/unit_tests/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/CMakeLists.txt
@@ -29,7 +29,7 @@ target_sources(${TARGET_NAME} PRIVATE
                ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/white_box.h
                ${NEO_SOURCE_DIR}/level_zero/core/source/dll/create_builtin_functions_lib.cpp
                ${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp
-               ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
+               ${NEO_SHARED_TEST_DIRECTORY}/common/tests_configuration.h
 )
 
 target_sources(${TARGET_NAME} PRIVATE
diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt
index e808810c96..56b4a2fd86 100644
--- a/opencl/test/unit_test/CMakeLists.txt
+++ b/opencl/test/unit_test/CMakeLists.txt
@@ -30,7 +30,7 @@ set_target_properties(run_ocl_tests PROPERTIES FOLDER ${PLATFORM_SPECIFIC_TEST_T
 
 set(IGDRCL_SRCS_tests_local
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
+    ${NEO_SHARED_TEST_DIRECTORY}/common/tests_configuration.h
 )
 
 add_subdirectory(libult)
diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp
index 4cabc222ae..ff1abb9647 100644
--- a/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp
+++ b/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "shared/test/common/test_macros/hw_test.h"
+#include "shared/test/common/tests_configuration.h"
 #include "shared/test/common/utilities/base_object_utils.h"
-#include "shared/test/unit_test/tests_configuration.h"
 
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h"
diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h
index 77db4d267b..a11a131eff 100644
--- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h
+++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h
@@ -15,7 +15,7 @@
 #include "shared/source/memory_manager/memory_banks.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"
-#include "shared/test/unit_test/tests_configuration.h"
+#include "shared/test/common/tests_configuration.h"
 
 #include "opencl/test/unit_test/command_stream/command_stream_fixture.h"
 
diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h
index e1acbdbf5d..0b35a9e969 100644
--- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h
+++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h
@@ -16,7 +16,7 @@
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"
-#include "shared/test/unit_test/tests_configuration.h"
+#include "shared/test/common/tests_configuration.h"
 
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
diff --git a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp
index 6dbab99cae..8a55a3aea9 100644
--- a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp
+++ b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp
@@ -14,7 +14,7 @@
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/tests_configuration.h"
+#include "shared/test/common/tests_configuration.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/platform/platform.h"
diff --git a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h
index b721268221..17ee146ecc 100644
--- a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h
+++ b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h
@@ -10,7 +10,7 @@
 #include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/unit_test/tests_configuration.h"
+#include "shared/test/common/tests_configuration.h"
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp
index cd27bebd07..7d3a38900e 100644
--- a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp
@@ -15,11 +15,11 @@
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_svm_manager.h"
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/common/utilities/base_object_utils.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
 #include "opencl/source/event/user_event.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp
index 0a0997fbec..90076fbdb7 100644
--- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp
+++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp
@@ -19,10 +19,10 @@
 #include "shared/test/common/helpers/kernel_binary_helper.h"
 #include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/helpers/variable_backup.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
 #include "opencl/source/api/api.h"
 #include "opencl/source/context/context.h"
diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp
index e8cb2ddcac..6d75b10a63 100644
--- a/opencl/test/unit_test/kernel/kernel_tests.cpp
+++ b/opencl/test/unit_test/kernel/kernel_tests.cpp
@@ -22,12 +22,12 @@
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_timestamp_container.h"
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/common/utilities/base_object_utils.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/helpers/cl_hw_helper.h"
diff --git a/opencl/test/unit_test/main.cpp b/opencl/test/unit_test/main.cpp
index 2622268bb0..8501e935b0 100644
--- a/opencl/test/unit_test/main.cpp
+++ b/opencl/test/unit_test/main.cpp
@@ -23,8 +23,8 @@
 #include "shared/test/common/mocks/mock_gmm_client_context.h"
 #include "shared/test/common/mocks/mock_sip.h"
 #include "shared/test/common/test_macros/test_checks_shared.h"
-#include "shared/test/unit_test/test_stats.h"
-#include "shared/test/unit_test/tests_configuration.h"
+#include "shared/test/common/test_stats.h"
+#include "shared/test/common/tests_configuration.h"
 
 #include "opencl/source/os_interface/ocl_reg_path.h"
 #include "opencl/source/platform/platform.h"
diff --git a/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp b/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp
index 416d5bb908..bf79d190a9 100644
--- a/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp
+++ b/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp
@@ -6,10 +6,10 @@
  */
 
 #include "shared/source/memory_manager/unified_memory_manager.h"
+#include "shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/test_macros/test_checks_shared.h"
-#include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h"
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp
index e48b9dec51..4eacb5bc7c 100644
--- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp
+++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp
@@ -8,6 +8,7 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/helpers/local_memory_access_modes.h"
 #include "shared/source/memory_manager/allocations_list.h"
+#include "shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
@@ -16,7 +17,6 @@
 #include "shared/test/common/mocks/mock_svm_manager.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h"
 
 #include "opencl/source/api/api.h"
 #include "opencl/source/mem_obj/mem_obj_helper.h"
diff --git a/opencl/test/unit_test/offline_compiler/main.cpp b/opencl/test/unit_test/offline_compiler/main.cpp
index fcfa51677b..ae5615bdcc 100644
--- a/opencl/test/unit_test/offline_compiler/main.cpp
+++ b/opencl/test/unit_test/offline_compiler/main.cpp
@@ -9,7 +9,7 @@
 #include "shared/test/common/helpers/custom_event_listener.h"
 #include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/libult/signal_utils.h"
-#include "shared/test/unit_test/test_stats.h"
+#include "shared/test/common/test_stats.h"
 
 #include "environment.h"
 #include "limits.h"
diff --git a/opencl/test/unit_test/ult_config_listener.h b/opencl/test/unit_test/ult_config_listener.h
index feee4754b5..8994fedeb5 100644
--- a/opencl/test/unit_test/ult_config_listener.h
+++ b/opencl/test/unit_test/ult_config_listener.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/test/unit_test/base_ult_config_listener.h"
+#include "shared/test/common/base_ult_config_listener.h"
 
 namespace NEO {
 
diff --git a/shared/test/unit_test/base_ult_config_listener.cpp b/shared/test/common/base_ult_config_listener.cpp
similarity index 97%
rename from shared/test/unit_test/base_ult_config_listener.cpp
rename to shared/test/common/base_ult_config_listener.cpp
index 5c21d1f8e2..ebcb1a1be7 100644
--- a/shared/test/unit_test/base_ult_config_listener.cpp
+++ b/shared/test/common/base_ult_config_listener.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/shared/test/unit_test/base_ult_config_listener.h b/shared/test/common/base_ult_config_listener.h
similarity index 92%
rename from shared/test/unit_test/base_ult_config_listener.h
rename to shared/test/common/base_ult_config_listener.h
index f7e58b7be6..39eb4720ff 100644
--- a/shared/test/unit_test/base_ult_config_listener.h
+++ b/shared/test/common/base_ult_config_listener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/shared/test/common/fixtures/CMakeLists.txt b/shared/test/common/fixtures/CMakeLists.txt
index 1ed5d8b6ed..f425f4c1f5 100644
--- a/shared/test/common/fixtures/CMakeLists.txt
+++ b/shared/test/common/fixtures/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 target_sources(neo_libult_common PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_tests_fixture.h
                ${CMAKE_CURRENT_SOURCE_DIR}/linear_stream_fixture.h
                ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_center_fixture.h
                ${CMAKE_CURRENT_SOURCE_DIR}/preamble_fixture.h
diff --git a/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h b/shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h
similarity index 93%
rename from shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h
rename to shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h
index ab2e0d7401..4c36f3a5f0 100644
--- a/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h
+++ b/shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h
@@ -8,8 +8,8 @@
 #pragma once
 
 #include "shared/source/memory_manager/unified_memory_manager.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
 #include <memory>
 
diff --git a/shared/test/common/fixtures/mock_aub_center_fixture.h b/shared/test/common/fixtures/mock_aub_center_fixture.h
index f5dd7e0fd7..319cbc313c 100644
--- a/shared/test/common/fixtures/mock_aub_center_fixture.h
+++ b/shared/test/common/fixtures/mock_aub_center_fixture.h
@@ -11,7 +11,7 @@
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/mocks/mock_aub_center.h"
 #include "shared/test/common/mocks/mock_aub_manager.h"
-#include "shared/test/unit_test/tests_configuration.h"
+#include "shared/test/common/tests_configuration.h"
 
 namespace NEO {
 struct MockAubCenterFixture {
diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt
index 838fc6fe66..0ed896bd40 100644
--- a/shared/test/common/libult/CMakeLists.txt
+++ b/shared/test/common/libult/CMakeLists.txt
@@ -115,8 +115,8 @@ set(neo_libult_common_SRCS_LIB_ULT
     ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_page_table_mngr.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_excludes.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_excludes.h
-    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/base_ult_config_listener.cpp
-    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/base_ult_config_listener.h
+    ${NEO_SHARED_TEST_DIRECTORY}/common/base_ult_config_listener.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/base_ult_config_listener.h
     ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_helpers.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
     ${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info_impl.cpp
diff --git a/shared/test/common/libult/create_tbx_sockets.cpp b/shared/test/common/libult/create_tbx_sockets.cpp
index b5d884b79e..a9c5d7d127 100644
--- a/shared/test/common/libult/create_tbx_sockets.cpp
+++ b/shared/test/common/libult/create_tbx_sockets.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "shared/source/tbx/tbx_sockets_imp.h"
 #include "shared/test/common/mocks/mock_tbx_sockets.h"
-#include "shared/test/unit_test/tests_configuration.h"
+#include "shared/test/common/tests_configuration.h"
 
 namespace NEO {
 TbxSockets *TbxSockets::create() {
diff --git a/shared/test/common/mocks/CMakeLists.txt b/shared/test/common/mocks/CMakeLists.txt
index 03b8966cc3..7ef30275f8 100644
--- a/shared/test/common/mocks/CMakeLists.txt
+++ b/shared/test/common/mocks/CMakeLists.txt
@@ -33,6 +33,7 @@ set(NEO_CORE_tests_mocks
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_compiler_interface_spirv.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_cpu_page_fault_manager.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_csr.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_debugger.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferrable_deletion.cpp
diff --git a/shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h b/shared/test/common/mocks/mock_cpu_page_fault_manager.h
similarity index 100%
rename from shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h
rename to shared/test/common/mocks/mock_cpu_page_fault_manager.h
diff --git a/shared/test/common/mocks/mock_device.cpp b/shared/test/common/mocks/mock_device.cpp
index 72e56fbb33..63fa100ed6 100644
--- a/shared/test/common/mocks/mock_device.cpp
+++ b/shared/test/common/mocks/mock_device.cpp
@@ -14,7 +14,7 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_ostime.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
-#include "shared/test/unit_test/tests_configuration.h"
+#include "shared/test/common/tests_configuration.h"
 
 using namespace NEO;
 
diff --git a/shared/test/common/test_configuration/aub_tests/test_mode.h b/shared/test/common/test_configuration/aub_tests/test_mode.h
index 9fc45a10f1..a0bebbf9eb 100644
--- a/shared/test/common/test_configuration/aub_tests/test_mode.h
+++ b/shared/test/common/test_configuration/aub_tests/test_mode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "shared/test/unit_test/tests_configuration.h"
+#include "shared/test/common/tests_configuration.h"
 
 namespace NEO {
 constexpr TestMode defaultTestMode = TestMode::AubTests;
diff --git a/shared/test/common/test_configuration/unit_tests/test_mode.h b/shared/test/common/test_configuration/unit_tests/test_mode.h
index 9687c5bb56..a7d1c087b6 100644
--- a/shared/test/common/test_configuration/unit_tests/test_mode.h
+++ b/shared/test/common/test_configuration/unit_tests/test_mode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "shared/test/unit_test/tests_configuration.h"
+#include "shared/test/common/tests_configuration.h"
 
 namespace NEO {
 constexpr TestMode defaultTestMode = TestMode::UnitTests;
diff --git a/shared/test/unit_test/test_stats.h b/shared/test/common/test_stats.h
similarity index 100%
rename from shared/test/unit_test/test_stats.h
rename to shared/test/common/test_stats.h
diff --git a/shared/test/unit_test/tests_configuration.h b/shared/test/common/tests_configuration.h
similarity index 86%
rename from shared/test/unit_test/tests_configuration.h
rename to shared/test/common/tests_configuration.h
index 2a87741c66..dec6530d76 100644
--- a/shared/test/unit_test/tests_configuration.h
+++ b/shared/test/common/tests_configuration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/shared/test/common/xe_hp_core/CMakeLists.txt b/shared/test/common/xe_hp_core/CMakeLists.txt
index de5567c412..e3d9ca5494 100644
--- a/shared/test/common/xe_hp_core/CMakeLists.txt
+++ b/shared/test/common/xe_hp_core/CMakeLists.txt
@@ -5,10 +5,10 @@
 #
 
 if(TESTS_XE_HP_CORE)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_libult_common PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                  ${CMAKE_CURRENT_SOURCE_DIR}/test_traits_xe_hp_core.h
   )
 
   add_subdirectories()
-endif()
+endif()
\ No newline at end of file
diff --git a/shared/test/common/xe_hpc_core/CMakeLists.txt b/shared/test/common/xe_hpc_core/CMakeLists.txt
index a8f60d674f..e585514772 100644
--- a/shared/test/common/xe_hpc_core/CMakeLists.txt
+++ b/shared/test/common/xe_hpc_core/CMakeLists.txt
@@ -5,7 +5,6 @@
 #
 
 if(TESTS_XE_HPC_CORE)
-
   set(NEO_CORE_TESTS_XE_HPC_CORE
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}unit_test_helper_xe_hpc_core_extra.inl
@@ -16,9 +15,5 @@ if(TESTS_XE_HPC_CORE)
 
   add_subdirectories()
 
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${NEO_CORE_TESTS_XE_HPC_CORE}
-                 ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hpc_core.cpp
-  )
-
-endif()
+  target_sources(neo_libult_common PRIVATE ${NEO_CORE_TESTS_XE_HPC_CORE})
+endif()
\ No newline at end of file
diff --git a/shared/test/common/xe_hpc_core/pvc/CMakeLists.txt b/shared/test/common/xe_hpc_core/pvc/CMakeLists.txt
index bef8c4a90c..6b7b7d2964 100644
--- a/shared/test/common/xe_hpc_core/pvc/CMakeLists.txt
+++ b/shared/test/common/xe_hpc_core/pvc/CMakeLists.txt
@@ -5,11 +5,8 @@
 #
 
 if(TESTS_PVC)
-  set(NEO_CORE_TESTS_PVC
-      ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/product_configs_pvc.h
+  target_sources(neo_libult_common PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/product_configs_pvc.h
   )
-  set_property(GLOBAL PROPERTY NEO_CORE_TESTS_PVC ${NEO_CORE_TESTS_PVC})
-  target_sources(${TARGET_NAME} PRIVATE ${NEO_CORE_TESTS_PVC})
-
-endif()
+endif()
\ No newline at end of file
diff --git a/shared/test/common/xe_hpg_core/CMakeLists.txt b/shared/test/common/xe_hpg_core/CMakeLists.txt
index 3dfb864d0b..9edd0d3a75 100644
--- a/shared/test/common/xe_hpg_core/CMakeLists.txt
+++ b/shared/test/common/xe_hpg_core/CMakeLists.txt
@@ -5,17 +5,10 @@
 #
 
 if(TESTS_XE_HPG_CORE)
-  set(IGDRCL_SRCS_tests_xe_hpg_core_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core.cpp
-  )
-  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpg_core_excludes})
-
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${IGDRCL_SRCS_tests_xe_hpg_core_excludes}
+  target_sources(neo_libult_common PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hpg_core.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/test_traits_xe_hpg_core.h
   )
 
   add_subdirectories()
-endif()
+endif()
\ No newline at end of file
diff --git a/shared/test/common/xe_hpg_core/dg2/CMakeLists.txt b/shared/test/common/xe_hpg_core/dg2/CMakeLists.txt
index 429bdc43cf..64b543db93 100644
--- a/shared/test/common/xe_hpg_core/dg2/CMakeLists.txt
+++ b/shared/test/common/xe_hpg_core/dg2/CMakeLists.txt
@@ -5,18 +5,11 @@
 #
 
 if(TESTS_DG2)
-  set(IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_dg2.cpp
-  )
-  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes})
-
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes}
+  target_sources(neo_libult_common PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                  ${CMAKE_CURRENT_SOURCE_DIR}/product_configs_dg2.h
                  ${CMAKE_CURRENT_SOURCE_DIR}/test_traits_dg2.h
-
   )
 
   add_subdirectories()
-endif()
+endif()
\ No newline at end of file
diff --git a/shared/test/common/xe_hpg_core/dg2/excludes_dg2.cpp b/shared/test/common/xe_hpg_core/dg2/excludes_dg2.cpp
deleted file mode 100644
index 0505a1f7c5..0000000000
--- a/shared/test/common/xe_hpg_core/dg2/excludes_dg2.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (C) 2021-2022 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "shared/test/common/test_macros/hw_test_base.h"
-
-HWTEST_EXCLUDE_PRODUCT(CommandEncodeStatesTest, givenSlmTotalSizeEqualZeroWhenDispatchingKernelThenSharedMemorySizeIsSetCorrectly, IGFX_DG2);
-HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenAllocateInternalAllocationInDevicePoolThen32BitAllocationIsCreated, IGFX_DG2);
-HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenLinearStreamIsAllocatedInDevicePoolThenLocalMemoryPoolIsUsed, IGFX_DG2);
-HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenAllocateKernelIsaInDevicePoolThenLocalMemoryPoolIsUsed, IGFX_DG2);
diff --git a/shared/test/common/xe_hpg_core/excludes_xe_hpg_core.cpp b/shared/test/common/xe_hpg_core/excludes_xe_hpg_core.cpp
deleted file mode 100644
index ae908fe599..0000000000
--- a/shared/test/common/xe_hpg_core/excludes_xe_hpg_core.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2021-2022 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "shared/test/common/test_macros/hw_test_base.h"
-
-HWTEST_EXCLUDE_PRODUCT(CommandEncodeStatesTest, givenEventAddressWhenEncodeThenMocsFromGmmHelperIsSet, IGFX_XE_HPG_CORE);
-HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterPreemptionTests, GivenDebuggerUsedWhenProgrammingStateSipThenStateSipIsAdded, IGFX_XE_HPG_CORE);
-HWTEST_EXCLUDE_PRODUCT(ComputeModeRequirements, givenComputeModeCmdSizeWhenLargeGrfModeChangeIsRequiredThenSCMCommandSizeIsCalculated, IGFX_XE_HPG_CORE);
-HWTEST_EXCLUDE_PRODUCT(ComputeModeRequirements, givenCoherencyWithSharedHandlesWhenCommandSizeIsCalculatedThenCorrectCommandSizeIsReturned, IGFX_XE_HPG_CORE);
-HWTEST_EXCLUDE_PRODUCT(ComputeModeRequirements, givenCoherencyWithoutSharedHandlesWhenCommandSizeIsCalculatedThenCorrectCommandSizeIsReturned, IGFX_XE_HPG_CORE);
diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt
index 3aeca81dba..b4f3ece20a 100644
--- a/shared/test/unit_test/CMakeLists.txt
+++ b/shared/test/unit_test/CMakeLists.txt
@@ -22,12 +22,12 @@ if(NOT NEO_SKIP_UNIT_TESTS)
   ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION()
   link_libraries(${ASAN_LIBS} ${TSAN_LIBS})
 
-  add_executable(${TARGET_NAME}
+  add_executable(neo_shared_tests
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                  ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/tests_configuration.h
                  ${CMAKE_CURRENT_SOURCE_DIR}/ult_specific_config.cpp
                  ${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp
+                 ${NEO_SHARED_TEST_DIRECTORY}/common/tests_configuration.h
                  ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/api_specific_config_shared_tests.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp
                  $<TARGET_OBJECTS:mock_gmm>
@@ -37,12 +37,12 @@ if(NOT NEO_SKIP_UNIT_TESTS)
                  $<TARGET_OBJECTS:neo_shared_mocks>
   )
 
-  add_dependencies(${TARGET_NAME} test_dynamic_lib)
+  add_dependencies(neo_shared_tests test_dynamic_lib)
 
-  set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
-  set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}")
+  set_property(TARGET neo_shared_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
+  set_target_properties(neo_shared_tests PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}")
 
-  target_include_directories(${TARGET_NAME} PRIVATE
+  target_include_directories(neo_shared_tests PRIVATE
                              ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
                              ${ENGINE_NODE_DIR}
                              ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
@@ -50,21 +50,21 @@ if(NOT NEO_SKIP_UNIT_TESTS)
   )
 
   if(UNIX AND NOT DISABLE_WDDM_LINUX)
-    target_include_directories(${TARGET_NAME} PUBLIC ${WDK_INCLUDE_PATHS})
+    target_include_directories(neo_shared_tests PUBLIC ${WDK_INCLUDE_PATHS})
   endif()
 
   if(WIN32)
-    target_link_libraries(${TARGET_NAME} dbghelp)
+    target_link_libraries(neo_shared_tests dbghelp)
   endif()
 
-  target_link_libraries(${TARGET_NAME}
+  target_link_libraries(neo_shared_tests
                         gmock-gtest
                         ${NEO_SHARED_MOCKABLE_LIB_NAME}
                         ${NEO_EXTRA_LIBS}
   )
 
   if(MSVC)
-    set_target_properties(${TARGET_NAME} PROPERTIES
+    set_target_properties(neo_shared_tests PROPERTIES
                           VS_DEBUGGER_COMMAND_ARGUMENTS "--gtest_filter=* --gtest_catch_exceptions=0 --enable_default_listener --disable_pagefaulting_tests"
                           VS_DEBUGGER_WORKING_DIRECTORY "$(OutDir)"
     )
@@ -81,9 +81,9 @@ if(NOT NEO_SKIP_UNIT_TESTS)
     add_subdirectories()
   endif()
 
-  target_sources(${TARGET_NAME} PRIVATE $<TARGET_OBJECTS:neo_unit_tests_config>)
+  target_sources(neo_shared_tests PRIVATE $<TARGET_OBJECTS:neo_unit_tests_config>)
   add_dependencies(unit_tests prepare_test_kernels_for_shared)
-  add_dependencies(unit_tests ${TARGET_NAME})
+  add_dependencies(unit_tests neo_shared_tests)
 
-  create_project_source_tree(${TARGET_NAME})
+  create_project_source_tree(neo_shared_tests)
 endif()
diff --git a/shared/test/unit_test/main.cpp b/shared/test/unit_test/main.cpp
index 215edfafa3..1e1024883d 100644
--- a/shared/test/unit_test/main.cpp
+++ b/shared/test/unit_test/main.cpp
@@ -12,6 +12,7 @@
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/utilities/debug_settings_reader.h"
+#include "shared/test/common/base_ult_config_listener.h"
 #include "shared/test/common/helpers/custom_event_listener.h"
 #include "shared/test/common/helpers/default_hw_info.inl"
 #include "shared/test/common/helpers/kernel_binary_helper.h"
@@ -24,9 +25,8 @@
 #include "shared/test/common/mocks/mock_gmm_client_context.h"
 #include "shared/test/common/mocks/mock_sip.h"
 #include "shared/test/common/test_macros/test_checks_shared.h"
-#include "shared/test/unit_test/base_ult_config_listener.h"
-#include "shared/test/unit_test/test_stats.h"
-#include "shared/test/unit_test/tests_configuration.h"
+#include "shared/test/common/test_stats.h"
+#include "shared/test/common/tests_configuration.h"
 
 #include "gmock/gmock.h"
 #include "hw_cmds_default.h"
diff --git a/shared/test/unit_test/memory_manager/surface_tests.cpp b/shared/test/unit_test/memory_manager/surface_tests.cpp
index 66991cc642..5b80d1c5be 100644
--- a/shared/test/unit_test/memory_manager/surface_tests.cpp
+++ b/shared/test/unit_test/memory_manager/surface_tests.cpp
@@ -9,12 +9,12 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_csr.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
 #include "gtest/gtest.h"
 
diff --git a/shared/test/unit_test/page_fault_manager/CMakeLists.txt b/shared/test/unit_test/page_fault_manager/CMakeLists.txt
index 76269ffb4a..8e0b9f89a0 100644
--- a/shared/test/unit_test/page_fault_manager/CMakeLists.txt
+++ b/shared/test/unit_test/page_fault_manager/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -7,11 +7,8 @@
 set(NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_tests_fixture.h
     ${CMAKE_CURRENT_SOURCE_DIR}/default_asan_options.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_cpu_page_fault_manager.h
 )
-
 set_property(GLOBAL PROPERTY NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS ${NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS})
 
-add_subdirectories()
+add_subdirectories()
\ No newline at end of file
diff --git a/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp b/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp
index 90ff9731de..0bfe7dd618 100644
--- a/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp
+++ b/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp
@@ -5,10 +5,10 @@
  *
  */
 
+#include "shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/test_checks_shared.h"
-#include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp b/shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp
index b1f142fe98..1ce7801460 100644
--- a/shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp
+++ b/shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp
@@ -1,17 +1,17 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/page_fault_manager/linux/cpu_page_fault_manager_linux.h"
+#include "shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"
-#include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
 #include "gtest/gtest.h"
 
diff --git a/shared/test/unit_test/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp b/shared/test/unit_test/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp
index a63b186062..58054cb125 100644
--- a/shared/test/unit_test/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp
+++ b/shared/test/unit_test/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp
@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/page_fault_manager/windows/cpu_page_fault_manager_windows.h"
-#include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h"
-#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
+#include "shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h"
+#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 
 #include "gtest/gtest.h"
 #include <windows.h>
diff --git a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/CMakeLists.txt b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/CMakeLists.txt
index a97f9c286a..502e08f06a 100644
--- a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/CMakeLists.txt
@@ -5,14 +5,12 @@
 #
 
 if(TESTS_XE_HP_SDV)
-  set(NEO_CORE_TESTS_XE_HP_CORE_XE_HP_SDV
-      ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_xe_hp_sdv.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hp_sdv.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hp_sdv.cpp
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_xe_hp_sdv.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hp_sdv.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hp_sdv.cpp
   )
 
-  target_sources(${TARGET_NAME} PRIVATE ${NEO_CORE_TESTS_XE_HP_CORE_XE_HP_SDV})
-
   add_subdirectories()
 endif()
diff --git a/shared/test/unit_test/xe_hpc_core/CMakeLists.txt b/shared/test/unit_test/xe_hpc_core/CMakeLists.txt
index f9185a0be9..9a2e9d0ec6 100644
--- a/shared/test/unit_test/xe_hpc_core/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpc_core/CMakeLists.txt
@@ -5,36 +5,29 @@
 #
 
 if(TESTS_XE_HPC_CORE)
-  set(NEO_SHARED_tests_xe_hpc_core
-      ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_tests_xe_hpc_core.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_xe_hpc_core.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_xe_hpc_core.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_xe_hpc_core_tests.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_xe_hpc_core_tests.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_xe_hpc_core.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_xe_hpc_core.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_xe_hpc_core.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hpc_core.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_xe_hpc_core.cpp
-  )
-
-  set(IGDRCL_SRCS_tests_xe_hpc_core_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpc_core.cpp
-  )
+  set(IGDRCL_SRCS_tests_xe_hpc_core_excludes ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpc_core.cpp)
   set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpc_core_excludes})
 
-  if(DEFINED AUB_STREAM_PROJECT_NAME)
-    list(APPEND NEO_SHARED_tests_xe_hpc_core
-         ${CMAKE_CURRENT_SOURCE_DIR}/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp
-    )
-  endif()
-
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_shared_tests PRIVATE
                  ${IGDRCL_SRCS_tests_xe_hpc_core_excludes}
-                 ${NEO_SHARED_tests_xe_hpc_core}
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_tests_xe_hpc_core.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_xe_hpc_core.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_xe_hpc_core.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_xe_hpc_core_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_xe_hpc_core_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_xe_hpc_core.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_xe_hpc_core.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_xe_hpc_core.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hpc_core.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hpc_core.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_xe_hpc_core.cpp
   )
 
+  if(DEFINED AUB_STREAM_PROJECT_NAME)
+    target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp)
+  endif()
+
   add_subdirectories()
-endif()
+endif()
\ No newline at end of file
diff --git a/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt b/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt
index d283fd5b05..13caa60af1 100644
--- a/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt
@@ -5,20 +5,19 @@
 #
 
 if(TESTS_PVC)
-  set(NEO_SHARED_TESTS_PVC
-      ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/device_binary_format_ar_tests_pvc.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/device_tests_pvc.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_pvc.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_pvc.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_pvc.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/product_config_tests_pvc.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_pvc.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_pvc.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_pvc.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_pvc.cpp
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/device_binary_format_ar_tests_pvc.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/device_tests_pvc.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_pvc.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_pvc.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_pvc.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/product_config_tests_pvc.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_pvc.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_pvc.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_pvc.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_pvc.cpp
   )
 
-  target_sources(${TARGET_NAME} PRIVATE ${NEO_SHARED_TESTS_PVC})
   add_subdirectories()
-endif()
+endif()
\ No newline at end of file
diff --git a/shared/test/common/xe_hpc_core/test_preemption_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_preemption_xe_hpc_core.cpp
similarity index 100%
rename from shared/test/common/xe_hpc_core/test_preemption_xe_hpc_core.cpp
rename to shared/test/unit_test/xe_hpc_core/test_preemption_xe_hpc_core.cpp
diff --git a/shared/test/unit_test/xe_hpg_core/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/CMakeLists.txt
index b47f437d4d..fc4e935cb8 100644
--- a/shared/test/unit_test/xe_hpg_core/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpg_core/CMakeLists.txt
@@ -5,15 +5,19 @@
 #
 
 if(TESTS_XE_HPG_CORE)
+  set(IGDRCL_SRCS_tests_xe_hpg_core_excludes ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core.cpp)
+  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpg_core_excludes})
+
   target_sources(neo_shared_tests PRIVATE
+                 ${IGDRCL_SRCS_tests_xe_hpg_core_excludes}
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                  ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_xe_hpg_core.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_xe_hpg_core_tests.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_xe_hpg_core.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_xe_hpg_core.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_xe_hpg_core.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_xe_hpg_core.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hpg_core.cpp
   )
 
   if(DEFINED AUB_STREAM_PROJECT_NAME)
@@ -21,4 +25,4 @@ if(TESTS_XE_HPG_CORE)
   endif()
 
   add_subdirectories()
-endif()
+endif()
\ No newline at end of file
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt
index c91f5ba48b..b6b3b764b7 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt
@@ -5,13 +5,16 @@
 #
 
 if(TESTS_DG2)
+  set(IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core_dg2.cpp)
+  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes})
+
   target_sources(neo_shared_tests PRIVATE
+                 ${IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes}
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                  ${CMAKE_CURRENT_SOURCE_DIR}/ail_tests_dg2.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/cache_policy_tests_dg2.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_dg2.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/device_binary_format_ar_tests_dg2.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core_dg2.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_dg2.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_dg2.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_dg2.cpp
@@ -22,4 +25,4 @@ if(TESTS_DG2)
   )
 
   add_subdirectories()
-endif()
+endif()
\ No newline at end of file
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/excludes_xe_hpg_core_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/excludes_xe_hpg_core_dg2.cpp
index 903384b9c8..9f6b8317cb 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/excludes_xe_hpg_core_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/excludes_xe_hpg_core_dg2.cpp
@@ -19,3 +19,7 @@ HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, WhenAllowRenderCompressionIsCalledThenT
 HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenConvertingTimestampsToCsDomainThenNothingIsChanged, IGFX_DG2);
 HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfStorageInfoAdjustmentIsRequiredThenFalseIsReturned, IGFX_DG2);
 HWTEST_EXCLUDE_PRODUCT(AILTests, whenModifyKernelIfRequiredIsCalledThenDontChangeKernelSources, IGFX_DG2);
+HWTEST_EXCLUDE_PRODUCT(CommandEncodeStatesTest, givenSlmTotalSizeEqualZeroWhenDispatchingKernelThenSharedMemorySizeIsSetCorrectly, IGFX_DG2);
+HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenAllocateInternalAllocationInDevicePoolThen32BitAllocationIsCreated, IGFX_DG2);
+HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenLinearStreamIsAllocatedInDevicePoolThenLocalMemoryPoolIsUsed, IGFX_DG2);
+HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenAllocateKernelIsaInDevicePoolThenLocalMemoryPoolIsUsed, IGFX_DG2);
\ No newline at end of file
diff --git a/shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp
index 3fbedb69ab..8361a96750 100644
--- a/shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp
+++ b/shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp
@@ -10,3 +10,8 @@
 HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenSamplerStateWhenAdjustSamplerStateThenNothingIsChanged, IGFX_XE_HPG_CORE);
 HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfBlitterForImagesIsSupportedThenFalseIsReturned, IGFX_XE_HPG_CORE);
 HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenTrueIsReturned, IGFX_XE_HPG_CORE);
+HWTEST_EXCLUDE_PRODUCT(CommandEncodeStatesTest, givenEventAddressWhenEncodeThenMocsFromGmmHelperIsSet, IGFX_XE_HPG_CORE);
+HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterPreemptionTests, GivenDebuggerUsedWhenProgrammingStateSipThenStateSipIsAdded, IGFX_XE_HPG_CORE);
+HWTEST_EXCLUDE_PRODUCT(ComputeModeRequirements, givenComputeModeCmdSizeWhenLargeGrfModeChangeIsRequiredThenSCMCommandSizeIsCalculated, IGFX_XE_HPG_CORE);
+HWTEST_EXCLUDE_PRODUCT(ComputeModeRequirements, givenCoherencyWithSharedHandlesWhenCommandSizeIsCalculatedThenCorrectCommandSizeIsReturned, IGFX_XE_HPG_CORE);
+HWTEST_EXCLUDE_PRODUCT(ComputeModeRequirements, givenCoherencyWithoutSharedHandlesWhenCommandSizeIsCalculatedThenCorrectCommandSizeIsReturned, IGFX_XE_HPG_CORE);
\ No newline at end of file
diff --git a/shared/test/common/xe_hpg_core/test_preemption_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/test_preemption_xe_hpg_core.cpp
similarity index 100%
rename from shared/test/common/xe_hpg_core/test_preemption_xe_hpg_core.cpp
rename to shared/test/unit_test/xe_hpg_core/test_preemption_xe_hpg_core.cpp