diff --git a/opencl/test/unit_test/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt
index 6e6e4b53fd..3f101c9ebb 100644
--- a/opencl/test/unit_test/aub_tests/CMakeLists.txt
+++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt
@@ -49,9 +49,6 @@ target_include_directories(igdrcl_aub_tests PRIVATE
                            ${NEO_SOURCE_DIR}/shared/test/common/helpers/includes${BRANCH_DIR_SUFFIX}
 )
 
-target_sources(igdrcl_aub_tests PRIVATE
-               ${NEO_SHARED_TEST_DIRECTORY}/unit_test/page_fault_manager/default_asan_options.cpp
-)
 copy_gmm_dll_for(igdrcl_aub_tests)
 add_subdirectories()
 
diff --git a/opencl/test/unit_test/memory_manager/CMakeLists.txt b/opencl/test/unit_test/memory_manager/CMakeLists.txt
index c0c54a69a2..4bcbc29693 100644
--- a/opencl/test/unit_test/memory_manager/CMakeLists.txt
+++ b/opencl/test/unit_test/memory_manager/CMakeLists.txt
@@ -15,18 +15,5 @@ set(IGDRCL_SRCS_tests_memory_manager
     ${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_token_tests.cpp
 )
 
-get_property(NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS GLOBAL PROPERTY NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS)
-list(APPEND IGDRCL_SRCS_tests_memory_manager ${NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS})
-
-if(WIN32)
-  get_property(NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS_TESTS GLOBAL PROPERTY NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS_TESTS)
-  list(APPEND IGDRCL_SRCS_tests_memory_manager ${NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS_TESTS})
-endif()
-
-if(UNIX)
-  get_property(NEO_CORE_PAGE_FAULT_MANAGER_LINUX_TESTS GLOBAL PROPERTY NEO_CORE_PAGE_FAULT_MANAGER_LINUX_TESTS)
-  list(APPEND IGDRCL_SRCS_tests_memory_manager ${NEO_CORE_PAGE_FAULT_MANAGER_LINUX_TESTS})
-endif()
-
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_memory_manager})
 add_subdirectories()
diff --git a/opencl/test/unit_test/mt_tests/memory_manager/CMakeLists.txt b/opencl/test/unit_test/mt_tests/memory_manager/CMakeLists.txt
index c391f0c2b4..b39d83748c 100644
--- a/opencl/test/unit_test/mt_tests/memory_manager/CMakeLists.txt
+++ b/opencl/test/unit_test/mt_tests/memory_manager/CMakeLists.txt
@@ -1,15 +1,12 @@
 #
-# Copyright (C) 2018-2021 Intel Corporation
+# Copyright (C) 2018-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(IGDRCL_SRCS_mt_tests_memory_manager
-    # local files
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_clear_queue_mt_tests.cpp
-
-    # necessary dependencies from neo_shared_tests
-    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/memory_manager/deferred_deleter_mt_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_mt_tests.cpp
 )
 target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_memory_manager})
diff --git a/shared/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp b/opencl/test/unit_test/mt_tests/memory_manager/deferred_deleter_mt_tests.cpp
similarity index 94%
rename from shared/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp
rename to opencl/test/unit_test/mt_tests/memory_manager/deferred_deleter_mt_tests.cpp
index 7f0078a37a..280b4ed4b3 100644
--- a/shared/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp
+++ b/opencl/test/unit_test/mt_tests/memory_manager/deferred_deleter_mt_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,16 +13,6 @@
 
 using namespace NEO;
 
-TEST(DeferredDeleter, WhenDeferredDeleterIsCreatedThenItIsNotMoveableOrCopyable) {
-    EXPECT_FALSE(std::is_move_constructible<DeferredDeleter>::value);
-    EXPECT_FALSE(std::is_copy_constructible<DeferredDeleter>::value);
-}
-
-TEST(DeferredDeleter, WhenDeferredDeleterIsCreatedThenItIsNotAssignable) {
-    EXPECT_FALSE(std::is_move_assignable<DeferredDeleter>::value);
-    EXPECT_FALSE(std::is_copy_assignable<DeferredDeleter>::value);
-}
-
 struct DeferredDeleterTest : public ::testing::Test {
 
     void SetUp() override {
diff --git a/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt
index 1f4171d25c..79d62e19ed 100644
--- a/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt
+++ b/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt
@@ -11,7 +11,7 @@ set(CLOC_SEGFAULT_TEST_SOURCES
     ${NEO_SHARED_DIRECTORY}/helpers/abort.cpp
     ${NEO_SHARED_DIRECTORY}/os_interface/os_library.h
     ${NEO_SHARED_TEST_DIRECTORY}/common/libult/signal_utils.h
-    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_helpers.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/debug_helpers.cpp
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/offline_compiler/ocloc_tests_configuration.cpp
 )
 
diff --git a/shared/test/unit_test/helpers/debug_helpers.cpp b/shared/test/common/helpers/debug_helpers.cpp
similarity index 90%
rename from shared/test/unit_test/helpers/debug_helpers.cpp
rename to shared/test/common/helpers/debug_helpers.cpp
index cd535050a6..6fc23742a7 100644
--- a/shared/test/unit_test/helpers/debug_helpers.cpp
+++ b/shared/test/common/helpers/debug_helpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt
index 0ed896bd40..56b2bb9fa7 100644
--- a/shared/test/common/libult/CMakeLists.txt
+++ b/shared/test/common/libult/CMakeLists.txt
@@ -117,8 +117,8 @@ set(neo_libult_common_SRCS_LIB_ULT
     ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_excludes.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_TEST_DIRECTORY}/common/helpers/debug_helpers.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/utilities/cpuintrinsics.cpp
     ${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info_impl.cpp
 )
 
diff --git a/shared/test/common/page_fault_manager/CMakeLists.txt b/shared/test/common/page_fault_manager/CMakeLists.txt
new file mode 100644
index 0000000000..4ea9c779ab
--- /dev/null
+++ b/shared/test/common/page_fault_manager/CMakeLists.txt
@@ -0,0 +1,10 @@
+#
+# Copyright (C) 2022 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+target_sources(neo_libult_common PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/default_asan_options.cpp
+)
diff --git a/shared/test/unit_test/page_fault_manager/default_asan_options.cpp b/shared/test/common/page_fault_manager/default_asan_options.cpp
similarity index 99%
rename from shared/test/unit_test/page_fault_manager/default_asan_options.cpp
rename to shared/test/common/page_fault_manager/default_asan_options.cpp
index b43f15f75d..0a25c5f7d8 100644
--- a/shared/test/unit_test/page_fault_manager/default_asan_options.cpp
+++ b/shared/test/common/page_fault_manager/default_asan_options.cpp
@@ -9,4 +9,4 @@ extern "C" {
 const char *__asan_default_options() { // NOLINT(readability-identifier-naming0
     return "allow_user_segv_handler=1";
 }
-}
+}
\ No newline at end of file
diff --git a/shared/test/unit_test/utilities/cpuintrinsics.cpp b/shared/test/common/utilities/cpuintrinsics.cpp
similarity index 100%
rename from shared/test/unit_test/utilities/cpuintrinsics.cpp
rename to shared/test/common/utilities/cpuintrinsics.cpp
diff --git a/shared/test/unit_test/memory_manager/CMakeLists.txt b/shared/test/unit_test/memory_manager/CMakeLists.txt
index 37c10f4f9e..7c0e3ed98e 100644
--- a/shared/test/unit_test/memory_manager/CMakeLists.txt
+++ b/shared/test/unit_test/memory_manager/CMakeLists.txt
@@ -9,7 +9,7 @@ target_sources(neo_shared_tests PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/address_mapper_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/alignment_selector_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_allocation_deletion_tests.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_mt_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/graphics_allocation_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/host_ptr_manager_tests.cpp
diff --git a/shared/test/unit_test/memory_manager/deferred_deleter_tests.cpp b/shared/test/unit_test/memory_manager/deferred_deleter_tests.cpp
new file mode 100644
index 0000000000..151833f142
--- /dev/null
+++ b/shared/test/unit_test/memory_manager/deferred_deleter_tests.cpp
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/test/common/mocks/mock_deferred_deleter.h"
+
+#include "gtest/gtest.h"
+
+using namespace NEO;
+
+TEST(DeferredDeleter, WhenDeferredDeleterIsCreatedThenItIsNotMoveableOrCopyable) {
+    EXPECT_FALSE(std::is_move_constructible<DeferredDeleter>::value);
+    EXPECT_FALSE(std::is_copy_constructible<DeferredDeleter>::value);
+}
+
+TEST(DeferredDeleter, WhenDeferredDeleterIsCreatedThenItIsNotAssignable) {
+    EXPECT_FALSE(std::is_move_assignable<DeferredDeleter>::value);
+    EXPECT_FALSE(std::is_copy_assignable<DeferredDeleter>::value);
+}
diff --git a/shared/test/unit_test/mocks/debugger_l0_create.cpp b/shared/test/unit_test/mocks/debugger_l0_create.cpp
deleted file mode 100644
index 003866e781..0000000000
--- a/shared/test/unit_test/mocks/debugger_l0_create.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2020-2022 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "shared/source/device/device.h"
-#include "shared/test/common/mocks/mock_l0_debugger.h"
-
-NEO::DebugerL0CreateFn mockDebuggerL0HwFactory[IGFX_MAX_CORE];
-
-namespace NEO {
-
-std::unique_ptr<Debugger> DebuggerL0::create(NEO::Device *device) {
-    initDebuggingInOs(device->getRootDeviceEnvironment().osInterface.get());
-    auto debugger = mockDebuggerL0HwFactory[device->getHardwareInfo().platform.eRenderCoreFamily](device);
-    return std::unique_ptr<DebuggerL0>(debugger);
-}
-
-} // namespace NEO
\ No newline at end of file
diff --git a/shared/test/unit_test/page_fault_manager/CMakeLists.txt b/shared/test/unit_test/page_fault_manager/CMakeLists.txt
index 8e0b9f89a0..336e09e2b3 100644
--- a/shared/test/unit_test/page_fault_manager/CMakeLists.txt
+++ b/shared/test/unit_test/page_fault_manager/CMakeLists.txt
@@ -4,11 +4,9 @@
 # SPDX-License-Identifier: MIT
 #
 
-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}/default_asan_options.cpp
+target_sources(neo_shared_tests PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_tests.cpp
 )
-set_property(GLOBAL PROPERTY NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS ${NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS})
 
-add_subdirectories()
\ No newline at end of file
+add_subdirectories()
diff --git a/shared/test/unit_test/page_fault_manager/linux/CMakeLists.txt b/shared/test/unit_test/page_fault_manager/linux/CMakeLists.txt
index f343e383e9..a2ca76b465 100644
--- a/shared/test/unit_test/page_fault_manager/linux/CMakeLists.txt
+++ b/shared/test/unit_test/page_fault_manager/linux/CMakeLists.txt
@@ -1,14 +1,12 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-set(NEO_CORE_PAGE_FAULT_MANAGER_LINUX_TESTS
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_linux_tests.cpp
-)
-
 if(UNIX)
-  set_property(GLOBAL PROPERTY NEO_CORE_PAGE_FAULT_MANAGER_LINUX_TESTS ${NEO_CORE_PAGE_FAULT_MANAGER_LINUX_TESTS})
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_linux_tests.cpp
+  )
 endif()
diff --git a/shared/test/unit_test/page_fault_manager/windows/CMakeLists.txt b/shared/test/unit_test/page_fault_manager/windows/CMakeLists.txt
index 080df9dacc..69440a21f2 100644
--- a/shared/test/unit_test/page_fault_manager/windows/CMakeLists.txt
+++ b/shared/test/unit_test/page_fault_manager/windows/CMakeLists.txt
@@ -1,14 +1,12 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-set(NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS_TESTS
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_windows_tests.cpp
-)
-
 if(WIN32)
-  set_property(GLOBAL PROPERTY NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS_TESTS ${NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS_TESTS})
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_windows_tests.cpp
+  )
 endif()