diff --git a/level_zero/cmake/l0_tests.cmake b/level_zero/cmake/l0_tests.cmake
index 284139fdd0..51162cb4b4 100644
--- a/level_zero/cmake/l0_tests.cmake
+++ b/level_zero/cmake/l0_tests.cmake
@@ -66,15 +66,6 @@ target_link_libraries(compute_runtime_mockable_extra
                       gmock-gtest
                       ${NEO_EXTRA_LIBS}
 )
-
-if(UNIX)
-  target_sources(compute_runtime_mockable_extra
-                 PRIVATE
-                 ${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info_impl.cpp
-                 ${NEO_SHARED_DIRECTORY}/gmm_helper${BRANCH_DIR_SUFFIX}resource_info_${DRIVER_MODEL}.cpp
-                 ${NEO_SHARED_DIRECTORY}/tbx/tbx_sockets_imp.cpp
-  )
-endif()
 set_target_properties(compute_runtime_mockable_extra PROPERTIES
                       POSITION_INDEPENDENT_CODE ON
                       FOLDER "ze_intel_gpu"
diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt
index 49d58fdcea..be2554f5c4 100644
--- a/opencl/test/unit_test/CMakeLists.txt
+++ b/opencl/test/unit_test/CMakeLists.txt
@@ -9,7 +9,6 @@ project(igdrcl_tests)
 set(OPENCL_TEST_PROJECTS_FOLDER "opencl runtime")
 set(PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER "${OPENCL_TEST_PROJECTS_FOLDER}/test platforms")
 set(OPENCL_UNIT_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(OPENCL_STATICALLY_LINKED_LIBRARIES_MOCKABLE ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
 
 include(${NEO_SOURCE_DIR}/cmake/setup_ult_global_flags.cmake)
 
@@ -32,7 +31,6 @@ set(IGDRCL_SRCS_tests_local
     ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
     ${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
 )
 
 add_subdirectory(libult)
@@ -107,7 +105,7 @@ if(COMPILER_SUPPORTS_SSE42)
   set_source_files_properties(helpers/uint16_sse4_tests.cpp PROPERTIES COMPILE_FLAGS -msse4.2)
 endif()
 
-target_link_libraries(igdrcl_tests ${OPENCL_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
+target_link_libraries(igdrcl_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
 target_link_libraries(igdrcl_tests igdrcl_mocks)
 
 target_include_directories(igdrcl_tests PRIVATE
diff --git a/opencl/test/unit_test/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt
index 1dd26fb3db..531670e3b2 100644
--- a/opencl/test/unit_test/aub_tests/CMakeLists.txt
+++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt
@@ -59,7 +59,6 @@ target_include_directories(igdrcl_aub_tests PRIVATE
 target_sources(igdrcl_aub_tests PRIVATE
                ${NEO_SHARED_TEST_DIRECTORY}/unit_test/page_fault_manager/default_asan_options.cpp
                ${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
-               ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
 )
 
 if(WIN32)
@@ -76,7 +75,7 @@ copy_gmm_dll_for(igdrcl_aub_tests)
 add_subdirectories()
 
 target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
-target_link_libraries(igdrcl_aub_tests ${OPENCL_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
+target_link_libraries(igdrcl_aub_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
 target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
 target_link_libraries(igdrcl_aub_tests gmock-gtest ${NEO_EXTRA_LIBS})
 if(UNIX)
diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt
index 4197e2533c..fa0c860adb 100644
--- a/opencl/test/unit_test/libult/CMakeLists.txt
+++ b/opencl/test/unit_test/libult/CMakeLists.txt
@@ -19,6 +19,10 @@ apply_macro_for_each_gen("TESTED")
 set(IGDRCL_SRCS_LIB_ULT
     ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp
     ${NEO_SOURCE_DIR}/opencl/source/dll/debug_manager.cpp
+    ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
+    ${NEO_SOURCE_DIR}/opencl/source/helpers/implicit_scaling_ocl.cpp
+    ${NEO_SOURCE_DIR}/opencl/source/memory_manager/compression_selector_ocl.cpp
+    ${NEO_SOURCE_DIR}/opencl/source/memory_manager/cpu_page_fault_manager_memory_sync.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}/shared/source/helpers/allow_deferred_deleter.cpp
diff --git a/opencl/test/unit_test/linux/CMakeLists.txt b/opencl/test/unit_test/linux/CMakeLists.txt
index b088fa0623..eb21679ef3 100644
--- a/opencl/test/unit_test/linux/CMakeLists.txt
+++ b/opencl/test/unit_test/linux/CMakeLists.txt
@@ -25,7 +25,6 @@ add_executable(igdrcl_${target_name}
                ${NEO_SHARED_DIRECTORY}/dll/linux/drm_neo_create.cpp
                ${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
                ${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
-               ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.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_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
@@ -35,7 +34,7 @@ if(NEO__LIBVA_FOUND)
   target_sources(igdrcl_${target_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/va_tests.cpp)
 endif()
 
-target_link_libraries(igdrcl_${target_name} ${OPENCL_STATICALLY_LINKED_LIBRARIES_MOCKABLE} igdrcl_mocks ${OPENCL_STATICALLY_LINKED_LIBRARIES_MOCKABLE} ${NEO_EXTRA_LIBS} gmock-gtest)
+target_link_libraries(igdrcl_${target_name} ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks ${NEO_EXTRA_LIBS} gmock-gtest)
 
 set_property(TARGET igdrcl_${target_name} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
 target_include_directories(igdrcl_${target_name} PRIVATE
diff --git a/opencl/test/unit_test/mt_tests/CMakeLists.txt b/opencl/test/unit_test/mt_tests/CMakeLists.txt
index dcd14bae97..c047bd345a 100644
--- a/opencl/test/unit_test/mt_tests/CMakeLists.txt
+++ b/opencl/test/unit_test/mt_tests/CMakeLists.txt
@@ -13,7 +13,6 @@ add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
                ${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/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
@@ -35,10 +34,9 @@ target_include_directories(igdrcl_mt_tests PRIVATE
 add_subdirectories()
 
 target_link_libraries(igdrcl_mt_tests ${TSAN_LIB})
-target_link_libraries(igdrcl_mt_tests ${OPENCL_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
+target_link_libraries(igdrcl_mt_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
 target_link_libraries(igdrcl_mt_tests gmock-gtest)
 target_link_libraries(igdrcl_mt_tests igdrcl_mocks ${NEO_EXTRA_LIBS})
-target_link_libraries(igdrcl_mt_tests ${OPENCL_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
 
 if(WIN32)
   add_dependencies(igdrcl_mt_tests mock_gdi igdrcl_tests)
diff --git a/opencl/test/unit_test/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt
index 762ca44698..966c8da16c 100644
--- a/opencl/test/unit_test/windows/CMakeLists.txt
+++ b/opencl/test/unit_test/windows/CMakeLists.txt
@@ -34,7 +34,6 @@ if(WIN32)
                  ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
                  ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp
-                 ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
                  ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
   )
 
diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt
index 86ef4b7514..015b5402ce 100644
--- a/shared/test/common/libult/CMakeLists.txt
+++ b/shared/test/common/libult/CMakeLists.txt
@@ -92,6 +92,7 @@ set(neo_libult_common_SRCS_LIB_ULT
     ${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_SHARED_DIRECTORY}/gmm_helper/resource_info_impl.cpp
 )
 
 get_property(NEO_SHARED_TESTS_CMD_PARSE GLOBAL PROPERTY NEO_SHARED_TESTS_CMD_PARSE)