diff --git a/level_zero/cmake/l0_tests.cmake b/level_zero/cmake/l0_tests.cmake
index f8c24d8cd9..74cbcd7b5d 100644
--- a/level_zero/cmake/l0_tests.cmake
+++ b/level_zero/cmake/l0_tests.cmake
@@ -11,28 +11,28 @@
 # These need to be added to a project to enable platform support in ULTs
 if(TESTS_GEN8)
   set(COMPUTE_RUNTIME_ULT_GEN8
-      ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen8.cpp
+      ${NEO_SHARED_TEST_DIRECTORY}/common/libult/gen8.cpp
       ${NEO_SHARED_TEST_DIRECTORY}/common/gen8/cmd_parse_gen8.cpp
   )
 endif()
 
 if(TESTS_GEN9)
   set(COMPUTE_RUNTIME_ULT_GEN9
-      ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen9.cpp
+      ${NEO_SHARED_TEST_DIRECTORY}/common/libult/gen9.cpp
       ${NEO_SHARED_TEST_DIRECTORY}/common/gen9/cmd_parse_gen9.cpp
   )
 endif()
 
 if(TESTS_GEN11)
   set(COMPUTE_RUNTIME_ULT_GEN11
-      ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen11.cpp
+      ${NEO_SHARED_TEST_DIRECTORY}/common/libult/gen11.cpp
       ${NEO_SHARED_TEST_DIRECTORY}/common/gen11/cmd_parse_gen11.cpp
   )
 endif()
 
 if(TESTS_GEN12LP)
   set(COMPUTE_RUNTIME_ULT_GEN12LP
-      ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen12lp.cpp
+      ${NEO_SHARED_TEST_DIRECTORY}/common/libult/gen12lp.cpp
       ${NEO_SHARED_TEST_DIRECTORY}/common/gen12lp/cmd_parse_gen12lp.cpp
   )
   include_directories(${NEO_SHARED_TEST_DIRECTORY}/common/gen12lp/cmd_parse${BRANCH_DIR_SUFFIX}/)
@@ -65,32 +65,32 @@ add_library(compute_runtime_mockable_extra
             STATIC
             EXCLUDE_FROM_ALL
             ${CMAKE_CURRENT_LIST_DIR}/l0_tests.cmake
-            ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
             ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/sip_init.cpp
             ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/libult/create_tbx_sockets.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_ult.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_SUFIX_DIR}/mock_gmm_client_context.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_cif.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_command_stream_receiver.cpp
             ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compiler_interface_spirv.cpp
             ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compiler_interface_spirv.h
-            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_command_stream_receiver.cpp
-            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_device.cpp
-            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_sip.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp
-            ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_helpers.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_ult.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_library.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_cif.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_compilers.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_tbx_sockets.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compilers.cpp
             ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_deferred_deleter.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_SUFIX_DIR}/mock_gmm_client_context.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_device.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_client_context_base.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_sip.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_helpers.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
+            ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp
+            ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/mock_execution_environment_gmm_fixture.cpp
+            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp
             ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp
             ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_memory_manager.cpp
             ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_program.cpp
             ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/mock_execution_environment_gmm_fixture.cpp
             ${NEO_SOURCE_DIR}/shared/source/debug_settings/debug_settings_manager.cpp
 )
 
diff --git a/level_zero/core/test/unit_tests/fixtures/CMakeLists.txt b/level_zero/core/test/unit_tests/fixtures/CMakeLists.txt
index 88c64bce20..d53d62da46 100644
--- a/level_zero/core/test/unit_tests/fixtures/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/fixtures/CMakeLists.txt
@@ -15,7 +15,7 @@ set(L0_FIXTURES_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/module_fixture.h
 )
 
-add_library(${TARGET_NAME} OBJECT ${L0_FIXTURES_SOURCES} ${IGDRCL_SRCS_tests_compiler_mocks})
+add_library(${TARGET_NAME} OBJECT ${L0_FIXTURES_SOURCES} ${NEO_CORE_tests_compiler_mocks})
 
 target_include_directories(${TARGET_NAME} PRIVATE
                            $<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
diff --git a/level_zero/core/test/unit_tests/fixtures/device_fixture.h b/level_zero/core/test/unit_tests/fixtures/device_fixture.h
index 715a0a1359..5574e12f6f 100644
--- a/level_zero/core/test/unit_tests/fixtures/device_fixture.h
+++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.h
@@ -10,10 +10,9 @@
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_device.h"
 
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
-
 #include "level_zero/core/source/context/context_imp.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
 
diff --git a/level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h b/level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h
index 6961562806..c713c12ae1 100644
--- a/level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h
+++ b/level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h
@@ -9,14 +9,13 @@
 
 #include "shared/source/helpers/constants.h"
 #include "shared/source/os_interface/device_factory.h"
+#include "shared/source/os_interface/os_inc_base.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"
 
-#include "opencl/source/os_interface/os_inc_base.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
-
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
diff --git a/level_zero/core/test/unit_tests/fixtures/module_fixture.h b/level_zero/core/test/unit_tests/fixtures/module_fixture.h
index 1443eee547..0176f97153 100644
--- a/level_zero/core/test/unit_tests/fixtures/module_fixture.h
+++ b/level_zero/core/test/unit_tests/fixtures/module_fixture.h
@@ -11,10 +11,10 @@
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/test_files.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 
 #include "opencl/source/program/kernel_info.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 
 #include "level_zero/core/source/module/module.h"
diff --git a/level_zero/core/test/unit_tests/gen11/test_cmdqueue_thread_arbitration_policy_gen11.cpp b/level_zero/core/test/unit_tests/gen11/test_cmdqueue_thread_arbitration_policy_gen11.cpp
index 07c717ebd0..7436c62ba1 100644
--- a/level_zero/core/test/unit_tests/gen11/test_cmdqueue_thread_arbitration_policy_gen11.cpp
+++ b/level_zero/core/test/unit_tests/gen11/test_cmdqueue_thread_arbitration_policy_gen11.cpp
@@ -8,9 +8,9 @@
 #include "shared/source/gen9/reg_configs.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 
 #include "opencl/source/helpers/hardware_commands_helper.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "test.h"
 
 #include "level_zero/core/source/driver/driver_imp.h"
diff --git a/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp
index bcd31f195f..6bf349af20 100644
--- a/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp
+++ b/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp
@@ -8,9 +8,9 @@
 #include "shared/source/gen9/reg_configs.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 
 #include "opencl/source/helpers/hardware_commands_helper.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "test.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
diff --git a/level_zero/core/test/unit_tests/main.cpp b/level_zero/core/test/unit_tests/main.cpp
index de2c12a8b9..fe47b583bb 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/test/common/helpers/memory_leak_listener.h"
 #include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/helpers/ult_hw_config.inl"
+#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"
 
@@ -19,7 +20,6 @@
 #include "opencl/source/utilities/logger.h"
 #include "opencl/test/unit_test/custom_event_listener.h"
 #include "opencl/test/unit_test/global_environment.h"
-#include "opencl/test/unit_test/mocks/mock_gmm_client_context.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"
 
diff --git a/level_zero/core/test/unit_tests/mocks/mock_module.h b/level_zero/core/test/unit_tests/mocks/mock_module.h
index 90826508d1..6300ddc040 100644
--- a/level_zero/core/test/unit_tests/mocks/mock_module.h
+++ b/level_zero/core/test/unit_tests/mocks/mock_module.h
@@ -6,10 +6,9 @@
  */
 
 #pragma once
+#include "shared/test/common/mocks/mock_cif.h"
 #include "shared/test/common/mocks/mock_compiler_interface.h"
 
-#include "opencl/test/unit_test/mocks/mock_cif.h"
-
 #include "level_zero/core/source/module/module_imp.h"
 #include "level_zero/core/test/unit_tests/mock.h"
 #include "level_zero/core/test/unit_tests/white_box.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 1d94047230..4d5ae5b70e 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
@@ -8,9 +8,9 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "test.h"
 
diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel.cpp
index ea240e6dbe..444b011e4e 100644
--- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel.cpp
+++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel.cpp
@@ -11,8 +11,8 @@
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/source/utilities/software_tags_manager.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "test.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.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 cb4b976ce9..1493c9dce4 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
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "test.h"
 
diff --git a/level_zero/core/test/unit_tests/sources/debugger/active_debugger_fixture.h b/level_zero/core/test/unit_tests/sources/debugger/active_debugger_fixture.h
index f1ec675a50..f5ed09c544 100644
--- a/level_zero/core/test/unit_tests/sources/debugger/active_debugger_fixture.h
+++ b/level_zero/core/test/unit_tests/sources/debugger/active_debugger_fixture.h
@@ -7,10 +7,10 @@
 
 #pragma once
 #include "shared/test/common/mocks/mock_compiler_interface.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_os_library.h"
 
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_source_level_debugger.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue_hw.h"
diff --git a/level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h b/level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h
index e75a8e14ae..0cba29f70d 100644
--- a/level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h
+++ b/level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h
@@ -6,11 +6,10 @@
  */
 
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"
 
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
-
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_l0_debugger.h"
diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp
index 8c517353aa..7372bcb14c 100644
--- a/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp
+++ b/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp
@@ -8,11 +8,11 @@
 #include "shared/source/device_binary_format/patchtokens_decoder.h"
 #include "shared/source/kernel/kernel_descriptor_from_patchtokens.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_elf.h"
 
 #include "opencl/source/program/kernel_info.h"
 #include "opencl/source/program/kernel_info_from_patchtokens.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "test.h"
 
 #include "level_zero/core/source/module/module_imp.h"
diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp
index 35961448f3..8046cc82cf 100644
--- a/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp
+++ b/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp
@@ -10,8 +10,8 @@
 #include "shared/source/helpers/preamble.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "test.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue_hw.h"
diff --git a/level_zero/core/test/unit_tests/sources/device/test_device.cpp b/level_zero/core/test/unit_tests/sources/device/test_device.cpp
index 97beaed28d..a9472d1f7f 100644
--- a/level_zero/core/test/unit_tests/sources/device/test_device.cpp
+++ b/level_zero/core/test/unit_tests/sources/device/test_device.cpp
@@ -8,14 +8,14 @@
 #include "shared/source/device/root_device.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/os_inc_base.h"
 #include "shared/source/os_interface/os_time.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_sip.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 
-#include "opencl/source/os_interface/os_inc_base.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "test.h"
 
diff --git a/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp b/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp
index 7900f912c5..4d6210abac 100644
--- a/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp
+++ b/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp
@@ -9,10 +9,9 @@
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/os_interface.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
-
 #include "level_zero/core/source/driver/driver_imp.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 
diff --git a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp
index 918c82e3fc..98f65eef81 100644
--- a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp
+++ b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp
@@ -8,12 +8,12 @@
 #include "shared/source/helpers/string.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/os_inc_base.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 
-#include "opencl/source/os_interface/os_inc_base.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_io_functions.h"
 #include "test.h"
 
diff --git a/level_zero/core/test/unit_tests/sources/event/test_event.cpp b/level_zero/core/test/unit_tests/sources/event/test_event.cpp
index d9cf617cc3..088b6a8704 100644
--- a/level_zero/core/test/unit_tests/sources/event/test_event.cpp
+++ b/level_zero/core/test/unit_tests/sources/event/test_event.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"
 
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "test.h"
diff --git a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp
index 03f48ae294..fb9c200928 100644
--- a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp
+++ b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp
@@ -10,9 +10,9 @@
 #include "shared/source/memory_manager/memory_operations_status.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/test_files.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "test.h"
 
diff --git a/opencl/source/command_stream/CMakeLists.txt b/opencl/source/command_stream/CMakeLists.txt
index 0c53ae2d08..92a66a93de 100644
--- a/opencl/source/command_stream/CMakeLists.txt
+++ b/opencl/source/command_stream/CMakeLists.txt
@@ -1,25 +1,25 @@
 #
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(RUNTIME_SRCS_COMMAND_STREAM
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/per_dss_backed_buffer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver.h
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_hw.h
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_hw_base.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_hw_bdw_plus.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw_base.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw_bdw_plus.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_with_aub_dump.h
     ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_with_aub_dump.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/create_command_stream_impl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/create_command_stream_impl.h
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/command_stream_receiver_simulated_hw.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw_base.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw_bdw_plus.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/per_dss_backed_buffer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver.h
     ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver_hw.h
diff --git a/opencl/source/command_stream/aub_command_stream_receiver.cpp b/opencl/source/command_stream/aub_command_stream_receiver.cpp
index 34322426e7..0770bb4ae4 100644
--- a/opencl/source/command_stream/aub_command_stream_receiver.cpp
+++ b/opencl/source/command_stream/aub_command_stream_receiver.cpp
@@ -14,8 +14,7 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/options.h"
 #include "shared/source/memory_manager/os_agnostic_memory_manager.h"
-
-#include "opencl/source/os_interface/os_inc_base.h"
+#include "shared/source/os_interface/os_inc_base.h"
 
 #include <algorithm>
 #include <cstring>
diff --git a/opencl/source/dll/create_command_stream.cpp b/opencl/source/dll/create_command_stream.cpp
index cb1004f7f6..0b7707c78e 100644
--- a/opencl/source/dll/create_command_stream.cpp
+++ b/opencl/source/dll/create_command_stream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/opencl/source/os_interface/CMakeLists.txt b/opencl/source/os_interface/CMakeLists.txt
index 8ef063809f..9911015dcf 100644
--- a/opencl/source/os_interface/CMakeLists.txt
+++ b/opencl/source/os_interface/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -9,7 +9,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/metrics_library.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/metrics_library.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ocl_reg_path.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_inc_base.h
     ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters.h
 )
diff --git a/opencl/source/os_interface/metrics_library.cpp b/opencl/source/os_interface/metrics_library.cpp
index b4fda54599..53d7c52100 100644
--- a/opencl/source/os_interface/metrics_library.cpp
+++ b/opencl/source/os_interface/metrics_library.cpp
@@ -8,8 +8,7 @@
 #include "opencl/source/os_interface/metrics_library.h"
 
 #include "shared/source/helpers/hw_helper.h"
-
-#include "opencl/source/os_interface/os_inc_base.h"
+#include "shared/source/os_interface/os_inc_base.h"
 
 namespace NEO {
 ///////////////////////////////////////////////////////
diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt
index 91269b26fb..042c6d2009 100644
--- a/opencl/test/unit_test/CMakeLists.txt
+++ b/opencl/test/unit_test/CMakeLists.txt
@@ -46,9 +46,9 @@ add_dependencies(unit_tests copy_test_files_per_product)
 
 set(IGDRCL_SRCS_tests_local
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/libult/os_interface.cpp
-    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
+    ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
     ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
 )
 
@@ -86,7 +86,7 @@ set(NEO_IGDRCL_TESTS__TARGET_OBJECTS
 
 if(DEFINED AUB_STREAM_PROJECT_NAME)
   add_library(aub_stream_mock_lib OBJECT EXCLUDE_FROM_ALL
-              ${NEO_SOURCE_DIR}/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp
+              ${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
   )
   list(APPEND NEO_IGDRCL_TESTS__TARGET_OBJECTS
        $<TARGET_OBJECTS:${AUB_STREAM_PROJECT_NAME}_all_hw>
@@ -135,6 +135,7 @@ endif()
 
 target_include_directories(igdrcl_tests PRIVATE
                            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_DIR_SUFFIX}
+                           ${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX}
                            ${ENGINE_NODE_DIR}
                            ${KHRONOS_GL_HEADERS_DIR}
                            ${CMAKE_CURRENT_SOURCE_DIR}/config
diff --git a/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl b/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl
index 20ec118db7..7fa9133d2d 100644
--- a/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl
+++ b/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,13 +7,13 @@
 
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/test/common/mocks/mock_aub_manager.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/api/cl_api_tests.h"
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
-#include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 
 using namespace NEO;
 
diff --git a/opencl/test/unit_test/api/cl_build_program_tests.inl b/opencl/test/unit_test/api/cl_build_program_tests.inl
index b276a5508f..68343ef4f5 100644
--- a/opencl/test/unit_test/api/cl_build_program_tests.inl
+++ b/opencl/test/unit_test/api/cl_build_program_tests.inl
@@ -9,12 +9,12 @@
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/file_io.h"
 #include "shared/test/common/helpers/test_files.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 
 #include "opencl/source/context/context.h"
 #include "opencl/source/program/kernel_info.h"
 #include "opencl/source/program/program.h"
 #include "opencl/test/unit_test/helpers/kernel_binary_helper.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 
 #include "cl_api_tests.h"
 
diff --git a/opencl/test/unit_test/aub/aub_center_tests.cpp b/opencl/test/unit_test/aub/aub_center_tests.cpp
index a3adf89274..071ccf6889 100644
--- a/opencl/test/unit_test/aub/aub_center_tests.cpp
+++ b/opencl/test/unit_test/aub/aub_center_tests.cpp
@@ -12,10 +12,10 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/mocks/mock_aub_manager.h"
 
 #include "opencl/test/unit_test/helpers/hw_helper_tests.h"
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
-#include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 
 #include "gtest/gtest.h"
 #include "third_party/aub_stream/headers/aubstream.h"
diff --git a/opencl/test/unit_test/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt
index 49f6c99c11..cb99ff9de0 100644
--- a/opencl/test/unit_test/aub_tests/CMakeLists.txt
+++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt
@@ -9,11 +9,11 @@ project(igdrcl_aub_tests)
 set(OPENCL_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
-     ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp
+     ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
      ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
      ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
-     ${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
      ${NEO_SOURCE_DIR}/shared/test/common/test_configuration/aub_tests/aub_tests_configuration.cpp
+     ${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
      $<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
      $<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
      $<TARGET_OBJECTS:igdrcl_libult>
diff --git a/opencl/test/unit_test/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp
index 2f1226cb68..0646f80d5a 100644
--- a/opencl/test/unit_test/built_ins/built_in_tests.cpp
+++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp
@@ -14,6 +14,7 @@
 #include "shared/source/helpers/string.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_compiler_interface.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
 
 #include "opencl/source/built_ins/aux_translation_builtin.h"
@@ -32,7 +33,6 @@
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "opencl/test/unit_test/test_macros/test_checks_ocl.h"
diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp
index 883c28eb61..15f3c74b2a 100644
--- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp
+++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp
@@ -10,6 +10,7 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_aub_manager.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 
 #include "opencl/source/helpers/hardware_context_controller.h"
@@ -19,7 +20,6 @@
 #include "opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
 #include "opencl/test/unit_test/mocks/mock_aub_csr.h"
-#include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 #include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h"
 #include "opencl/test/unit_test/mocks/mock_execution_environment.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp
index 2038a95376..33312b92da 100644
--- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp
+++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp
@@ -11,6 +11,7 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_aub_manager.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 
 #include "opencl/source/helpers/hardware_context_controller.h"
@@ -22,7 +23,6 @@
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
 #include "opencl/test/unit_test/mocks/mock_aub_csr.h"
 #include "opencl/test/unit_test/mocks/mock_aub_file_stream.h"
-#include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 #include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
diff --git a/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp b/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp
index 6ffc967034..84b3458cd5 100644
--- a/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp
+++ b/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp
@@ -8,6 +8,7 @@
 #include "shared/source/aub_mem_dump/page_table_entry_bits.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_aub_manager.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 
 #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"
@@ -18,7 +19,6 @@
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
 #include "opencl/test/unit_test/mocks/mock_aub_csr.h"
 #include "opencl/test/unit_test/mocks/mock_aub_file_stream.h"
-#include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 #include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h"
 #include "opencl/test/unit_test/mocks/mock_execution_environment.h"
 #include "opencl/test/unit_test/mocks/mock_mdi.h"
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp
index 90f6a11725..966b031dbe 100644
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp
@@ -12,6 +12,7 @@
 #include "shared/source/helpers/timestamp_packet.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/source/utilities/tag_allocator.h"
+#include "shared/test/common/mocks/mock_aub_manager.h"
 
 #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"
 #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h"
@@ -24,7 +25,6 @@
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
 #include "opencl/test/unit_test/mocks/mock_aub_csr.h"
-#include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 #include "opencl/test/unit_test/mocks/mock_execution_environment.h"
 #include "opencl/test/unit_test/mocks/mock_os_context.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
diff --git a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp
index 6df6e8d35f..f097879c63 100644
--- a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp
+++ b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp
@@ -10,10 +10,10 @@
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_experimental_command_buffer.h"
 
 #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h"
 #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
-#include "opencl/test/unit_test/mocks/mock_experimental_command_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "test.h"
 
diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp
index 51328c438f..7e648fcc89 100644
--- a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp
+++ b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp
@@ -16,7 +16,9 @@
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/variable_backup.h"
+#include "shared/test/common/mocks/mock_aub_manager.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
+#include "shared/test/common/mocks/mock_tbx_csr.h"
 
 #include "opencl/source/command_stream/aub_command_stream_receiver.h"
 #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h"
@@ -30,7 +32,6 @@
 #include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
-#include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 #include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_execution_environment.h"
@@ -38,7 +39,6 @@
 #include "opencl/test/unit_test/mocks/mock_mdi.h"
 #include "opencl/test/unit_test/mocks/mock_os_context.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
-#include "opencl/test/unit_test/mocks/mock_tbx_csr.h"
 #include "test.h"
 
 #include "tbx_command_stream_fixture.h"
diff --git a/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp
index cf2f8b8024..9323526980 100644
--- a/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp
+++ b/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp
@@ -1,13 +1,14 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/test/common/mocks/mock_tbx_sockets.h"
+#include "shared/test/common/mocks/mock_tbx_stream.h"
+
 #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h"
-#include "opencl/test/unit_test/mocks/mock_tbx_sockets.h"
-#include "opencl/test/unit_test/mocks/mock_tbx_stream.h"
 
 #include "gtest/gtest.h"
 
diff --git a/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h b/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h
index 099d53f835..25cb4578fe 100644
--- a/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h
+++ b/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h
@@ -9,11 +9,11 @@
 
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/mocks/mock_aub_manager.h"
 #include "shared/test/unit_test/tests_configuration.h"
 
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
-#include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 
 namespace NEO {
diff --git a/opencl/test/unit_test/global_environment.cpp b/opencl/test/unit_test/global_environment.cpp
index 023a437eee..80f86b5878 100644
--- a/opencl/test/unit_test/global_environment.cpp
+++ b/opencl/test/unit_test/global_environment.cpp
@@ -8,8 +8,7 @@
 #include "opencl/test/unit_test/global_environment.h"
 
 #include "shared/source/helpers/hw_info.h"
-
-#include "opencl/source/os_interface/os_inc_base.h"
+#include "shared/source/os_interface/os_inc_base.h"
 
 TestEnvironment::TestEnvironment() {
     igcDebugVarStack.reserve(3);
diff --git a/opencl/test/unit_test/global_environment.h b/opencl/test/unit_test/global_environment.h
index 337dcd856e..1d7392273e 100644
--- a/opencl/test/unit_test/global_environment.h
+++ b/opencl/test/unit_test/global_environment.h
@@ -8,8 +8,7 @@
 #pragma once
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/os_library.h"
-
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 
 #include "gtest/gtest.h"
 
diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt
index 5ac29d6ac2..51c49cf579 100644
--- a/opencl/test/unit_test/libult/CMakeLists.txt
+++ b/opencl/test/unit_test/libult/CMakeLists.txt
@@ -16,7 +16,7 @@ macro(macro_for_each_gen)
       if(EXISTS ${SRC_FILE})
         list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
       endif()
-      set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/${BRANCH}${GEN_TYPE_LOWER}.cpp)
+      set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/libult/${BRANCH}${GEN_TYPE_LOWER}.cpp)
       if(EXISTS ${SRC_FILE})
         list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
       endif()
@@ -49,23 +49,6 @@ apply_macro_for_each_gen("TESTED")
 
 set(IGDRCL_SRCS_LIB_ULT
     ${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp
-    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
-    ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp
-    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_helpers.cpp
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/execution_environment_helper.cpp
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/execution_environment_helper.h
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_tbx_sockets.cpp
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/debug_manager.cpp
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/io_functions.cpp
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_ult.cpp
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_library.cpp
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_library.h
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_command_stream_receiver.h
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp
-    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/base_ult_config_listener.cpp
-    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/base_ult_config_listener.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_leak_listener.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_leak_listener.h
     ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_management.cpp
@@ -73,6 +56,23 @@ set(IGDRCL_SRCS_LIB_ULT
     ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/sip_init.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.h
+    ${NEO_SHARED_TEST_DIRECTORY}/common/libult/create_tbx_sockets.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.h
+    ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_ult.cpp
+    ${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}/unit_test/helpers/debug_helpers.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
+    ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp
+    ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp
+    ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/execution_environment_helper.cpp
+    ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/execution_environment_helper.h
+    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/debug_manager.cpp
+    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/io_functions.cpp
+    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h
+    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_command_stream_receiver.h
+    ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp
 )
 
 get_property(NEO_SHARED_TESTS_CMD_PARSE GLOBAL PROPERTY NEO_SHARED_TESTS_CMD_PARSE)
@@ -166,7 +166,7 @@ target_include_directories(igdrcl_libult PRIVATE
 
 target_include_directories(igdrcl_libult_env PRIVATE
                            $<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
-                           ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_DIR_SUFFIX}
+                           ${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX}
 )
 
 set_property(GLOBAL PROPERTY IGDRCL_SRCS_ENABLE_TESTED_HW ${IGDRCL_SRCS_ENABLE_TESTED_HW})
diff --git a/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h b/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h
index c4e038114c..4f672d9f4f 100644
--- a/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h
+++ b/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/memory_manager/os_agnostic_memory_manager.h"
+#include "shared/test/common/mocks/mock_experimental_command_buffer.h"
 
 #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "opencl/test/unit_test/mocks/mock_experimental_command_buffer.h"
 
 namespace NEO {
 
diff --git a/opencl/test/unit_test/libult/ult_command_stream_receiver.h b/opencl/test/unit_test/libult/ult_command_stream_receiver.h
index 91c3c8d287..befe2f0791 100644
--- a/opencl/test/unit_test/libult/ult_command_stream_receiver.h
+++ b/opencl/test/unit_test/libult/ult_command_stream_receiver.h
@@ -14,8 +14,7 @@
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/helpers/dispatch_flags_helper.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
-
-#include "opencl/test/unit_test/mocks/mock_experimental_command_buffer.h"
+#include "shared/test/common/mocks/mock_experimental_command_buffer.h"
 
 #include <map>
 #include <memory>
diff --git a/opencl/test/unit_test/linux/CMakeLists.txt b/opencl/test/unit_test/linux/CMakeLists.txt
index 6ca3ab08ca..3cba562acf 100644
--- a/opencl/test/unit_test/linux/CMakeLists.txt
+++ b/opencl/test/unit_test/linux/CMakeLists.txt
@@ -21,13 +21,13 @@ add_executable(igdrcl_${target_name}
                ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_linux_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
                ${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
+               ${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
                ${NEO_SOURCE_DIR}/opencl/source/dll/linux/allocator_helper.cpp
                ${NEO_SOURCE_DIR}/opencl/source/dll/linux/drm_neo_create.cpp
                ${NEO_SOURCE_DIR}/opencl/source/dll/linux/options_linux.cpp
                ${NEO_SOURCE_DIR}/opencl/source/dll/linux/os_interface.cpp
-               ${NEO_SOURCE_DIR}/opencl/source/os_interface/linux/platform_teardown_linux.cpp
                ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
-               ${NEO_SOURCE_DIR}/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp
+               ${NEO_SOURCE_DIR}/opencl/source/os_interface/linux/platform_teardown_linux.cpp
                ${NEO_SOURCE_DIR}/opencl/test/unit_test/linux${BRANCH_DIR_SUFFIX}/drm_other_requests.cpp
                ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp
 )
diff --git a/opencl/test/unit_test/mocks/CMakeLists.txt b/opencl/test/unit_test/mocks/CMakeLists.txt
index ecf4a4160a..86e3cab0fa 100644
--- a/opencl/test/unit_test/mocks/CMakeLists.txt
+++ b/opencl/test/unit_test/mocks/CMakeLists.txt
@@ -4,15 +4,6 @@
 # SPDX-License-Identifier: MIT
 #
 
-set(IGDRCL_SRCS_tests_compiler_mocks
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_cif.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_cif.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.h
-)
-
-set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_compiler_mocks ${IGDRCL_SRCS_tests_compiler_mocks})
-
 set(IGDRCL_SRCS_tests_mocks
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_allocation_properties.h
@@ -21,13 +12,12 @@ set(IGDRCL_SRCS_tests_mocks
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_center.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_csr.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_file_stream.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_manager.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_stream.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_subcapture_manager.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_block_kernel_manager.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_buffer.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtins.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtins.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtins.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_cl_device.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_cl_device.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_cl_execution_environment.h
@@ -38,24 +28,19 @@ set(IGDRCL_SRCS_tests_mocks
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_device_queue.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_event.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_execution_environment.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_experimental_command_buffer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_client_context_base.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_client_context_base.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_gmm_client_context.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_gmm_client_context.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_host_ptr_manager.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_internal_allocation_storage.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_image.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_internal_allocation_storage.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_io_functions.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel_info.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_lrca_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.h
@@ -63,20 +48,21 @@ set(IGDRCL_SRCS_tests_mocks
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_ostime.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_platform.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_platform.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_program.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_program.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_program.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_sampler.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_sharing_factory.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_source_level_debugger.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_submissions_aggregator.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_svm_manager.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_csr.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_stream.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_timestamp_container.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_cl_device_factory.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_cl_device_factory.h
     ${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr_impl.cpp
-    ${IGDRCL_SRCS_tests_compiler_mocks}
+    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX}/mock_gmm_client_context.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX}/mock_gmm_client_context.h
+    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_experimental_command_buffer.h
+    ${NEO_CORE_tests_compiler_mocks}
 )
 
 if(WIN32)
diff --git a/opencl/test/unit_test/mocks/mock_program.cpp b/opencl/test/unit_test/mocks/mock_program.cpp
index f6d471caed..a10ef613fa 100644
--- a/opencl/test/unit_test/mocks/mock_program.cpp
+++ b/opencl/test/unit_test/mocks/mock_program.cpp
@@ -13,6 +13,7 @@
 #include "shared/source/program/program_info_from_patchtokens.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/mocks/mock_compiler_interface.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 
 #include "opencl/source/context/context.h"
@@ -20,7 +21,6 @@
 #include "opencl/source/program/kernel_info.h"
 #include "opencl/test/unit_test/helpers/ult_limits.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 
 namespace NEO {
 ClDeviceVector toClDeviceVector(ClDevice &clDevice) {
diff --git a/opencl/test/unit_test/mt_tests/CMakeLists.txt b/opencl/test/unit_test/mt_tests/CMakeLists.txt
index c754cbbc45..b2d56ba8f2 100644
--- a/opencl/test/unit_test/mt_tests/CMakeLists.txt
+++ b/opencl/test/unit_test/mt_tests/CMakeLists.txt
@@ -17,13 +17,13 @@ endif()
 add_custom_target(run_mt_unit_tests)
 add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
+               ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
+               ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
                ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
-               ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp
                ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
                ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
                ${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
-               ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
                $<TARGET_OBJECTS:igdrcl_libult>
                $<TARGET_OBJECTS:igdrcl_libult_cs>
                $<TARGET_OBJECTS:igdrcl_libult_env>
diff --git a/opencl/test/unit_test/offline_compiler/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/CMakeLists.txt
index ba95fb0ecd..bb18b08933 100644
--- a/opencl/test/unit_test/offline_compiler/CMakeLists.txt
+++ b/opencl/test/unit_test/offline_compiler/CMakeLists.txt
@@ -43,7 +43,7 @@ else()
   )
 endif()
 
-get_property(IGDRCL_SRCS_tests_compiler_mocks GLOBAL PROPERTY IGDRCL_SRCS_tests_compiler_mocks)
+get_property(NEO_CORE_tests_compiler_mocks GLOBAL PROPERTY NEO_CORE_tests_compiler_mocks)
 
 set(IGDRCL_SRCS_offline_compiler_tests
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
@@ -61,11 +61,13 @@ set(IGDRCL_SRCS_offline_compiler_tests
     ${NEO_SHARED_DIRECTORY}/helpers/file_io.cpp
     ${NEO_SHARED_DIRECTORY}/memory_manager/deferred_deleter.cpp
     ${NEO_SHARED_DIRECTORY}/memory_manager/deferred_deleter.h
+    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compilers.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compilers.h
     ${NEO_SHARED_TEST_DIRECTORY}/unit_test/device_binary_format/zebin_tests.h
     ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.cpp
     ${IGDRCL_SRCS_cloc}
     ${IGDRCL_SRCS_offline_compiler_mock}
-    ${IGDRCL_SRCS_tests_compiler_mocks}
+    ${NEO_CORE_tests_compiler_mocks}
     ${CLOC_LIB_SRCS_LIB}
     ${CLOC_LIB_SRCS_UTILITIES}
 )
diff --git a/opencl/test/unit_test/offline_compiler/environment.h b/opencl/test/unit_test/offline_compiler/environment.h
index a53ccadc2d..db13a8b742 100644
--- a/opencl/test/unit_test/offline_compiler/environment.h
+++ b/opencl/test/unit_test/offline_compiler/environment.h
@@ -8,10 +8,9 @@
 #pragma once
 
 #include "shared/offline_compiler/source/offline_compiler.h"
+#include "shared/source/os_interface/os_inc_base.h"
 #include "shared/test/common/helpers/test_files.h"
-
-#include "opencl/source/os_interface/os_inc_base.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 
 #include "gtest/gtest.h"
 
diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
index 12d755d697..fa1c6bf635 100644
--- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
@@ -12,10 +12,10 @@
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/unit_test/device_binary_format/zebin_tests.h"
 
 #include "opencl/source/platform/extensions.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 
 #include "compiler_options.h"
 #include "environment.h"
diff --git a/opencl/test/unit_test/program/program_spec_constants_tests.cpp b/opencl/test/unit_test/program/program_spec_constants_tests.cpp
index 80a40e8ef0..05a374387a 100644
--- a/opencl/test/unit_test/program/program_spec_constants_tests.cpp
+++ b/opencl/test/unit_test/program/program_spec_constants_tests.cpp
@@ -7,10 +7,10 @@
 
 #include "shared/source/compiler_interface/compiler_interface.h"
 #include "shared/source/compiler_interface/compiler_interface.inl"
+#include "shared/test/common/mocks/mock_cif.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 
-#include "opencl/test/unit_test/mocks/mock_cif.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
 
 #include "gmock/gmock.h"
diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp
index 8144b47348..34789b6a47 100644
--- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp
+++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp
@@ -13,11 +13,11 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
 #include "shared/test/common/helpers/variable_backup.h"
+#include "shared/test/common/libult/source_level_debugger_library.h"
 
 #include "opencl/source/platform/platform.h"
 #include "opencl/source/program/kernel_info.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
-#include "opencl/test/unit_test/libult/source_level_debugger_library.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 #include "opencl/test/unit_test/mocks/mock_source_level_debugger.h"
diff --git a/shared/offline_compiler/source/decoder/helper.cpp b/shared/offline_compiler/source/decoder/helper.cpp
index a3937a1420..72fa2a5e8d 100644
--- a/shared/offline_compiler/source/decoder/helper.cpp
+++ b/shared/offline_compiler/source/decoder/helper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,10 +8,9 @@
 #include "helper.h"
 
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/os_interface/os_inc_base.h"
 #include "shared/source/os_interface/os_library.h"
 
-#include "opencl/source/os_interface/os_inc_base.h"
-
 #include "igfxfmid.h"
 
 #include <algorithm>
diff --git a/shared/offline_compiler/source/decoder/iga_wrapper.cpp b/shared/offline_compiler/source/decoder/iga_wrapper.cpp
index e7a4153f47..58108620e5 100644
--- a/shared/offline_compiler/source/decoder/iga_wrapper.cpp
+++ b/shared/offline_compiler/source/decoder/iga_wrapper.cpp
@@ -8,10 +8,9 @@
 #include "iga_wrapper.h"
 
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/os_interface/os_inc_base.h"
 #include "shared/source/os_interface/os_library.h"
 
-#include "opencl/source/os_interface/os_inc_base.h"
-
 #include "helper.h"
 #include "igfxfmid.h"
 #include "translate_platform_base.h"
diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp
index 389a986453..5904864279 100644
--- a/shared/offline_compiler/source/offline_compiler.cpp
+++ b/shared/offline_compiler/source/offline_compiler.cpp
@@ -18,9 +18,9 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/string.h"
+#include "shared/source/os_interface/os_inc_base.h"
 #include "shared/source/os_interface/os_library.h"
 
-#include "opencl/source/os_interface/os_inc_base.h"
 #include "opencl/source/platform/extensions.h"
 
 #include "cif/common/cif_main.h"
diff --git a/shared/source/compiler_interface/compiler_interface.cpp b/shared/source/compiler_interface/compiler_interface.cpp
index e044b545b6..2725c0a6a5 100644
--- a/shared/source/compiler_interface/compiler_interface.cpp
+++ b/shared/source/compiler_interface/compiler_interface.cpp
@@ -12,8 +12,7 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/hw_info.h"
-
-#include "opencl/source/os_interface/os_inc_base.h"
+#include "shared/source/os_interface/os_inc_base.h"
 
 #include "cif/common/cif_main.h"
 #include "cif/helpers/error.h"
diff --git a/shared/source/os_interface/CMakeLists.txt b/shared/source/os_interface/CMakeLists.txt
index d19f9e1e8f..5d2500d181 100644
--- a/shared/source/os_interface/CMakeLists.txt
+++ b/shared/source/os_interface/CMakeLists.txt
@@ -28,6 +28,7 @@ set(NEO_CORE_OS_INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/os_time.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_time.h
     ${CMAKE_CURRENT_SOURCE_DIR}/print.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/os_inc_base.h
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE ${NEO_CORE_OS_INTERFACE})
diff --git a/opencl/source/os_interface/os_inc_base.h b/shared/source/os_interface/os_inc_base.h
similarity index 100%
rename from opencl/source/os_interface/os_inc_base.h
rename to shared/source/os_interface/os_inc_base.h
diff --git a/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp b/shared/test/common/aub_stream_mocks/aub_stream_interface_mock.cpp
similarity index 80%
rename from opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp
rename to shared/test/common/aub_stream_mocks/aub_stream_interface_mock.cpp
index b2798b21b2..d8577f3dc2 100644
--- a/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp
+++ b/shared/test/common/aub_stream_mocks/aub_stream_interface_mock.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "opencl/test/unit_test/mocks/mock_aub_manager.h"
+#include "shared/test/common/mocks/mock_aub_manager.h"
 
 namespace NEO {
 aub_stream::AubManager *createAubManager(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize, uint32_t stepping, bool localMemorySupported, uint32_t streamMode, uint64_t gpuAddressSpace) {
diff --git a/opencl/test/unit_test/libult/create_tbx_sockets.cpp b/shared/test/common/libult/create_tbx_sockets.cpp
similarity index 76%
rename from opencl/test/unit_test/libult/create_tbx_sockets.cpp
rename to shared/test/common/libult/create_tbx_sockets.cpp
index cc2b881470..b5d884b79e 100644
--- a/opencl/test/unit_test/libult/create_tbx_sockets.cpp
+++ b/shared/test/common/libult/create_tbx_sockets.cpp
@@ -1,15 +1,14 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #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 "opencl/test/unit_test/mocks/mock_tbx_sockets.h"
-
 namespace NEO {
 TbxSockets *TbxSockets::create() {
     if (testMode == TestMode::AubTestsWithTbx) {
diff --git a/shared/test/unit_test/libult/gen11.cpp b/shared/test/common/libult/gen11.cpp
similarity index 100%
rename from shared/test/unit_test/libult/gen11.cpp
rename to shared/test/common/libult/gen11.cpp
diff --git a/shared/test/unit_test/libult/gen12lp.cpp b/shared/test/common/libult/gen12lp.cpp
similarity index 94%
rename from shared/test/unit_test/libult/gen12lp.cpp
rename to shared/test/common/libult/gen12lp.cpp
index f3e6e14eb1..cde3330a3b 100644
--- a/shared/test/unit_test/libult/gen12lp.cpp
+++ b/shared/test/common/libult/gen12lp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/shared/test/unit_test/libult/gen8.cpp b/shared/test/common/libult/gen8.cpp
similarity index 100%
rename from shared/test/unit_test/libult/gen8.cpp
rename to shared/test/common/libult/gen8.cpp
diff --git a/shared/test/unit_test/libult/gen9.cpp b/shared/test/common/libult/gen9.cpp
similarity index 100%
rename from shared/test/unit_test/libult/gen9.cpp
rename to shared/test/common/libult/gen9.cpp
diff --git a/opencl/test/unit_test/libult/os_interface.cpp b/shared/test/common/libult/os_interface.cpp
similarity index 100%
rename from opencl/test/unit_test/libult/os_interface.cpp
rename to shared/test/common/libult/os_interface.cpp
diff --git a/opencl/test/unit_test/libult/source_level_debugger_library.cpp b/shared/test/common/libult/source_level_debugger_library.cpp
similarity index 98%
rename from opencl/test/unit_test/libult/source_level_debugger_library.cpp
rename to shared/test/common/libult/source_level_debugger_library.cpp
index 1920a4603c..345139ce19 100644
--- a/opencl/test/unit_test/libult/source_level_debugger_library.cpp
+++ b/shared/test/common/libult/source_level_debugger_library.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/opencl/test/unit_test/libult/source_level_debugger_library.h b/shared/test/common/libult/source_level_debugger_library.h
similarity index 98%
rename from opencl/test/unit_test/libult/source_level_debugger_library.h
rename to shared/test/common/libult/source_level_debugger_library.h
index 899d1a2c82..294d47a523 100644
--- a/opencl/test/unit_test/libult/source_level_debugger_library.h
+++ b/shared/test/common/libult/source_level_debugger_library.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/opencl/test/unit_test/libult/source_level_debugger_ult.cpp b/shared/test/common/libult/source_level_debugger_ult.cpp
similarity index 81%
rename from opencl/test/unit_test/libult/source_level_debugger_ult.cpp
rename to shared/test/common/libult/source_level_debugger_ult.cpp
index c0bbf1b94c..68d05e869e 100644
--- a/opencl/test/unit_test/libult/source_level_debugger_ult.cpp
+++ b/shared/test/common/libult/source_level_debugger_ult.cpp
@@ -6,8 +6,7 @@
  */
 
 #include "shared/source/source_level_debugger/source_level_debugger.h"
-
-#include "opencl/test/unit_test/libult/source_level_debugger_library.h"
+#include "shared/test/common/libult/source_level_debugger_library.h"
 
 namespace NEO {
 OsLibrary *SourceLevelDebugger::loadDebugger() {
diff --git a/shared/test/common/mocks/CMakeLists.txt b/shared/test/common/mocks/CMakeLists.txt
index 6deac2c942..d71144b5d1 100644
--- a/shared/test/common/mocks/CMakeLists.txt
+++ b/shared/test/common/mocks/CMakeLists.txt
@@ -4,17 +4,36 @@
 # SPDX-License-Identifier: MIT
 #
 
+set(NEO_CORE_tests_compiler_mocks
+    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_cif.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_cif.h
+    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compilers.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compilers.h
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_tests_compiler_mocks ${NEO_CORE_tests_compiler_mocks})
+
 set(NEO_CORE_tests_mocks
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_manager.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_bindless_heaps_helper.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_cif.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_cif.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_command_stream_receiver.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_command_stream_receiver.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_compiler_interface_spirv.cpp
     ${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_direct_submission_hw.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_direct_submission_diagnostic_collector.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_dispatch_kernel_encoder_interface.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_dispatch_kernel_encoder_interface.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_experimental_command_buffer.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_client_context_base.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_client_context_base.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_gmm_client_context.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_gmm_client_context.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_debugger.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_device.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_device.h
@@ -31,6 +50,8 @@ set(NEO_CORE_tests_mocks
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferred_deleter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferred_deleter.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_physical_address_allocator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_csr.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_stream.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.h
 )
diff --git a/opencl/test/unit_test/mocks/mock_aub_manager.h b/shared/test/common/mocks/mock_aub_manager.h
similarity index 100%
rename from opencl/test/unit_test/mocks/mock_aub_manager.h
rename to shared/test/common/mocks/mock_aub_manager.h
diff --git a/opencl/test/unit_test/mocks/mock_cif.cpp b/shared/test/common/mocks/mock_cif.cpp
similarity index 98%
rename from opencl/test/unit_test/mocks/mock_cif.cpp
rename to shared/test/common/mocks/mock_cif.cpp
index 12797b898d..303af73961 100644
--- a/opencl/test/unit_test/mocks/mock_cif.cpp
+++ b/shared/test/common/mocks/mock_cif.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/test/unit_test/mocks/mock_cif.h"
+#include "shared/test/common/mocks/mock_cif.h"
 
 #include "cif/builtins/memory/buffer/buffer.h"
 #include "cif/export/library_api.h"
diff --git a/opencl/test/unit_test/mocks/mock_cif.h b/shared/test/common/mocks/mock_cif.h
similarity index 100%
rename from opencl/test/unit_test/mocks/mock_cif.h
rename to shared/test/common/mocks/mock_cif.h
diff --git a/opencl/test/unit_test/mocks/mock_compilers.cpp b/shared/test/common/mocks/mock_compilers.cpp
similarity index 99%
rename from opencl/test/unit_test/mocks/mock_compilers.cpp
rename to shared/test/common/mocks/mock_compilers.cpp
index 416d41b4ae..acc9e50cab 100644
--- a/opencl/test/unit_test/mocks/mock_compilers.cpp
+++ b/shared/test/common/mocks/mock_compilers.cpp
@@ -9,13 +9,12 @@
 
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/os_interface/os_inc_base.h"
 #include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/mocks/mock_compiler_interface.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_sip.h"
 
-#include "opencl/source/os_interface/os_inc_base.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
-
 #include "cif/macros/enable.h"
 #include "compiler_options.h"
 #include "ocl_igc_interface/fcl_ocl_device_ctx.h"
diff --git a/opencl/test/unit_test/mocks/mock_compilers.h b/shared/test/common/mocks/mock_compilers.h
similarity index 99%
rename from opencl/test/unit_test/mocks/mock_compilers.h
rename to shared/test/common/mocks/mock_compilers.h
index 21f8fd5a0f..3662bbd646 100644
--- a/opencl/test/unit_test/mocks/mock_compilers.h
+++ b/shared/test/common/mocks/mock_compilers.h
@@ -8,8 +8,7 @@
 #pragma once
 
 #include "shared/source/compiler_interface/compiler_interface.h"
-
-#include "opencl/test/unit_test/mocks/mock_cif.h"
+#include "shared/test/common/mocks/mock_cif.h"
 
 #include "ocl_igc_interface/fcl_ocl_device_ctx.h"
 #include "ocl_igc_interface/igc_ocl_device_ctx.h"
diff --git a/opencl/test/unit_test/mocks/mock_experimental_command_buffer.h b/shared/test/common/mocks/mock_experimental_command_buffer.h
similarity index 93%
rename from opencl/test/unit_test/mocks/mock_experimental_command_buffer.h
rename to shared/test/common/mocks/mock_experimental_command_buffer.h
index 311981c667..63c491bd59 100644
--- a/opencl/test/unit_test/mocks/mock_experimental_command_buffer.h
+++ b/shared/test/common/mocks/mock_experimental_command_buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/opencl/test/unit_test/mocks/mock_gmm_client_context.cpp b/shared/test/common/mocks/mock_gmm_client_context.cpp
similarity index 96%
rename from opencl/test/unit_test/mocks/mock_gmm_client_context.cpp
rename to shared/test/common/mocks/mock_gmm_client_context.cpp
index 02a88a236f..1bce836c6a 100644
--- a/opencl/test/unit_test/mocks/mock_gmm_client_context.cpp
+++ b/shared/test/common/mocks/mock_gmm_client_context.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/opencl/test/unit_test/mocks/mock_gmm_client_context.h b/shared/test/common/mocks/mock_gmm_client_context.h
similarity index 68%
rename from opencl/test/unit_test/mocks/mock_gmm_client_context.h
rename to shared/test/common/mocks/mock_gmm_client_context.h
index 90565a5075..29d7e30fc2 100644
--- a/opencl/test/unit_test/mocks/mock_gmm_client_context.h
+++ b/shared/test/common/mocks/mock_gmm_client_context.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "opencl/test/unit_test/mocks/mock_gmm_client_context_base.h"
+#include "shared/test/common/mocks/mock_gmm_client_context_base.h"
 
 namespace NEO {
 class MockGmmClientContext : public MockGmmClientContextBase {
diff --git a/opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp b/shared/test/common/mocks/mock_gmm_client_context_base.cpp
similarity index 89%
rename from opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp
rename to shared/test/common/mocks/mock_gmm_client_context_base.cpp
index f6725986ed..6f94b58f04 100644
--- a/opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp
+++ b/shared/test/common/mocks/mock_gmm_client_context_base.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "opencl/test/unit_test/mocks/mock_gmm_client_context.h"
+#include "shared/test/common/mocks/mock_gmm_client_context_base.h"
 
 namespace NEO {
 
diff --git a/opencl/test/unit_test/mocks/mock_gmm_client_context_base.h b/shared/test/common/mocks/mock_gmm_client_context_base.h
similarity index 95%
rename from opencl/test/unit_test/mocks/mock_gmm_client_context_base.h
rename to shared/test/common/mocks/mock_gmm_client_context_base.h
index b208884380..fba64d8c3c 100644
--- a/opencl/test/unit_test/mocks/mock_gmm_client_context_base.h
+++ b/shared/test/common/mocks/mock_gmm_client_context_base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/opencl/test/unit_test/mocks/mock_tbx_csr.h b/shared/test/common/mocks/mock_tbx_csr.h
similarity index 100%
rename from opencl/test/unit_test/mocks/mock_tbx_csr.h
rename to shared/test/common/mocks/mock_tbx_csr.h
diff --git a/opencl/test/unit_test/mocks/mock_tbx_sockets.h b/shared/test/common/mocks/mock_tbx_sockets.h
similarity index 95%
rename from opencl/test/unit_test/mocks/mock_tbx_sockets.h
rename to shared/test/common/mocks/mock_tbx_sockets.h
index ab07914243..21b940d284 100644
--- a/opencl/test/unit_test/mocks/mock_tbx_sockets.h
+++ b/shared/test/common/mocks/mock_tbx_sockets.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/opencl/test/unit_test/mocks/mock_tbx_stream.h b/shared/test/common/mocks/mock_tbx_stream.h
similarity index 86%
rename from opencl/test/unit_test/mocks/mock_tbx_stream.h
rename to shared/test/common/mocks/mock_tbx_stream.h
index bee63c2766..e3e8cccda9 100644
--- a/opencl/test/unit_test/mocks/mock_tbx_stream.h
+++ b/shared/test/common/mocks/mock_tbx_stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp
index 5032e86d95..0ae1a77e47 100644
--- a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp
+++ b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp
@@ -11,12 +11,12 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/test_files.h"
+#include "shared/test/common/mocks/mock_cif.h"
 #include "shared/test/common/mocks/mock_compiler_interface.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/global_environment.h"
-#include "opencl/test/unit_test/mocks/mock_cif.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 
 #include "gmock/gmock.h"
 #include "hw_cmds.h"
diff --git a/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp b/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp
index c11b05d3e2..a3920cc172 100644
--- a/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp
+++ b/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp
@@ -7,8 +7,8 @@
 
 #include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h"
 #include "shared/source/gmm_helper/resource_info.h"
+#include "shared/test/common/mocks/mock_gmm_client_context.h"
 
-#include "opencl/test/unit_test/mocks/mock_gmm_client_context.h"
 #include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h"
 #include "opencl/test/unit_test/mocks/mock_hw_helper.h"
 #include "test.h"
diff --git a/shared/test/unit_test/main.cpp b/shared/test/unit_test/main.cpp
index c4de2172ad..4bd8ae5096 100644
--- a/shared/test/unit_test/main.cpp
+++ b/shared/test/unit_test/main.cpp
@@ -15,6 +15,7 @@
 #include "shared/test/common/helpers/memory_leak_listener.h"
 #include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/helpers/ult_hw_config.inl"
+#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/tests_configuration.h"
@@ -24,7 +25,6 @@
 #include "opencl/test/unit_test/global_environment.h"
 #include "opencl/test/unit_test/helpers/kernel_binary_helper.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
-#include "opencl/test/unit_test/mocks/mock_gmm_client_context.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
 #include "opencl/test/unit_test/ult_config_listener.h"
 
diff --git a/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp b/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp
index 42a1231f67..6169b5b2f6 100644
--- a/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp
+++ b/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp
@@ -7,7 +7,8 @@
 
 #include "shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.h"
 
-#include "opencl/test/unit_test/mocks/mock_aub_manager.h"
+#include "shared/test/common/mocks/mock_aub_manager.h"
+
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
 
 #include "aub_mem_dump.h"