diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9ac1d89c1..1977c4b1ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -763,6 +763,12 @@ set(BUILTINS_SPIRV_LIB_NAME "builtins_spirv")
 set(BUILTINS_VME_LIB_NAME "builtins_vme")
 set(SCHEDULER_BINARY_LIB_NAME "scheduler_binary")
 
+if(WIN32)
+  set(NEO_EXTRA_LIBS Ws2_32)
+else()
+  set(NEO_EXTRA_LIBS dl pthread rt)
+endif()
+
 add_subdirectory_unique(shared/source)
 add_subdirectory_unique(shared/generate_cpp_array)
 
@@ -800,7 +806,6 @@ macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
   if(${MOCKABLE})
     target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual)
     target_compile_definitions(${SHARINGS_ENABLE_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual)
-    target_compile_definitions(${LIB_NAME} PUBLIC DEFAULT_TEST_PLATFORM=${DEFAULT_TESTED_PLATFORM} DEFAULT_TEST_FAMILY_NAME=${DEFAULT_TESTED_FAMILY_NAME} ${TESTED_GEN_FLAGS_DEFINITONS})
   else()
     target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
     target_compile_definitions(${SHARINGS_ENABLE_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
@@ -825,13 +830,6 @@ else()
   endif()
 endif()
 
-set(NEO_STATICALLY_LINKED_LIBRARIES ${NEO_RELEASE_LIB_NAME} ${NEO_SHARED_RELEASE_LIB_NAME} ${NEO_RELEASE_LIB_NAME} ${NEO_SHARED_RELEASE_LIB_NAME})
-set(NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
-
-if(NOT SKIP_UNIT_TESTS)
-  include(${CMAKE_CURRENT_SOURCE_DIR}/level_zero/cmake/${BRANCH_TYPE}/l0_tests.cmake)
-endif()
-
 add_subdirectory_unique(shared/test/unit_test)
 
 if(DEFAULT_TESTED_PLATFORM AND NOT SKIP_NEO_UNIT_TESTS)
diff --git a/level_zero/CMakeLists.txt b/level_zero/CMakeLists.txt
index f6404677b6..0076872c9a 100644
--- a/level_zero/CMakeLists.txt
+++ b/level_zero/CMakeLists.txt
@@ -7,6 +7,9 @@
 include(cmake/verify_l0_support.cmake)
 
 if(BUILD_WITH_L0)
+  if(NOT SKIP_UNIT_TESTS)
+    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${BRANCH_TYPE}/l0_tests.cmake)
+  endif()
 
   set(TARGET_NAME_L0 ze_intel_gpu)
 
@@ -242,7 +245,6 @@ if(BUILD_WITH_L0)
     )
     target_link_libraries(${TARGET_NAME_L0}
                           dxgi
-                          ws2_32
     )
     if(DEFINED L0_DLL_RC_FILE)
       message(STATUS "Setting L0 Resource Info")
@@ -310,7 +312,6 @@ if(BUILD_WITH_L0)
   target_include_directories(${TARGET_NAME_L0} PRIVATE ${IGC_COMMON_PARENT_DIR})
 
   if(UNIX)
-    set(OS_SPECIFIC_LIBS dl pthread rt)
     target_include_directories(${TARGET_NAME_L0} PUBLIC
                                ${L0_ROOT_DIR}/core/source/os_interface/linux
                                ${I915_INCLUDES_DIR}
@@ -319,7 +320,6 @@ if(BUILD_WITH_L0)
                                ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}
     )
   else()
-    set(OS_SPECIFIC_LIBS "")
     target_include_directories(${TARGET_NAME_L0} PUBLIC
                                ${L0_ROOT_DIR}/core/source/os_interface/windows
     )
@@ -392,7 +392,7 @@ if(BUILD_WITH_L0)
 
     if(${MOCKABLE})
       get_property(COMPUTE_RUNTIME_DEFINITIONS
-                   TARGET ${NEO_MOCKABLE_LIB_NAME}
+                   TARGET ${NEO_SHARED_MOCKABLE_LIB_NAME}
                    PROPERTY COMPILE_DEFINITIONS
       )
       target_compile_definitions(${LIB_NAME}
@@ -471,7 +471,7 @@ if(BUILD_WITH_L0)
 
   target_link_libraries(${TARGET_NAME_L0}
                         ${NEO_SHARED_RELEASE_LIB_NAME}
-                        ${OS_SPECIFIC_LIBS} ${ASAN_LIBS} ${TSAN_LIBS}
+                        ${NEO_EXTRA_LIBS} ${ASAN_LIBS} ${TSAN_LIBS}
   )
 
   if(UNIX)
diff --git a/level_zero/cmake/l0_tests.cmake b/level_zero/cmake/l0_tests.cmake
index d395d9a811..284139fdd0 100644
--- a/level_zero/cmake/l0_tests.cmake
+++ b/level_zero/cmake/l0_tests.cmake
@@ -6,7 +6,7 @@
 
 #Extract compute runtime COMPILE_DEFINITIONS
 get_property(COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS
-             TARGET ${NEO_MOCKABLE_LIB_NAME}
+             TARGET ${NEO_SHARED_MOCKABLE_LIB_NAME}
              PROPERTY COMPILE_DEFINITIONS
 )
 
@@ -20,7 +20,7 @@ endif()
 
 #Extract compute runtime INCLUDE_DIRECTORIES
 get_property(COMPUTE_RUNTIME_MOCKABLE_INCLUDES
-             TARGET ${NEO_MOCKABLE_LIB_NAME}
+             TARGET ${NEO_SHARED_MOCKABLE_LIB_NAME}
              PROPERTY INCLUDE_DIRECTORIES
 )
 
@@ -30,7 +30,6 @@ add_library(compute_runtime_mockable_extra
             EXCLUDE_FROM_ALL
             ${CMAKE_CURRENT_LIST_DIR}/l0_tests.cmake
             ${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
-            ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
             ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/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
@@ -65,14 +64,9 @@ target_compile_definitions(compute_runtime_mockable_extra
 
 target_link_libraries(compute_runtime_mockable_extra
                       gmock-gtest
+                      ${NEO_EXTRA_LIBS}
 )
 
-if(WIN32)
-  target_link_libraries(compute_runtime_mockable_extra
-                        ws2_32
-  )
-endif()
-
 if(UNIX)
   target_sources(compute_runtime_mockable_extra
                  PRIVATE
@@ -80,9 +74,6 @@ if(UNIX)
                  ${NEO_SHARED_DIRECTORY}/gmm_helper${BRANCH_DIR_SUFFIX}resource_info_${DRIVER_MODEL}.cpp
                  ${NEO_SHARED_DIRECTORY}/tbx/tbx_sockets_imp.cpp
   )
-  target_link_libraries(compute_runtime_mockable_extra
-                        dl
-  )
 endif()
 set_target_properties(compute_runtime_mockable_extra PROPERTIES
                       POSITION_INDEPENDENT_CODE ON
diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt
index 8dd434b8f6..50c23125a0 100644
--- a/level_zero/core/test/aub_tests/CMakeLists.txt
+++ b/level_zero/core/test/aub_tests/CMakeLists.txt
@@ -48,7 +48,6 @@ target_sources(${TARGET_NAME} PRIVATE
 )
 
 target_sources(${TARGET_NAME} PRIVATE
-               ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
                ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/ult_device_factory.cpp
                ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/ult_device_factory.h
                ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_client_context.cpp
@@ -95,10 +94,10 @@ endif()
 copy_gmm_dll_for(${TARGET_NAME})
 add_subdirectories()
 
-target_link_libraries(${TARGET_NAME} ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
+target_link_libraries(${TARGET_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
 target_link_libraries(${TARGET_NAME} ${HW_LIBS_ULT})
 target_link_libraries(${TARGET_NAME} gmock-gtest)
-target_link_libraries(${TARGET_NAME} ${IGDRCL_EXTRA_LIBS})
+target_link_libraries(${TARGET_NAME} ${NEO_EXTRA_LIBS})
 
 if(UNIX)
   target_link_libraries(${TARGET_NAME} rt)
diff --git a/level_zero/core/test/unit_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/CMakeLists.txt
index 6f5639573c..325289e6b5 100644
--- a/level_zero/core/test/unit_tests/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/CMakeLists.txt
@@ -86,7 +86,7 @@ else()
 endif()
 
 target_link_libraries(${TARGET_NAME}
-                      ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE}
+                      ${NEO_SHARED_MOCKABLE_LIB_NAME}
                       compute_runtime_mockable_extra
                       ${HW_LIBS_ULT}
                       gmock-gtest
diff --git a/level_zero/experimental/test/unit_tests/CMakeLists.txt b/level_zero/experimental/test/unit_tests/CMakeLists.txt
index 742370423b..a9767209fe 100644
--- a/level_zero/experimental/test/unit_tests/CMakeLists.txt
+++ b/level_zero/experimental/test/unit_tests/CMakeLists.txt
@@ -70,15 +70,13 @@ target_include_directories(
                            ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
 )
 
-if(UNIX)
-  target_link_libraries(${TARGET_NAME} pthread rt)
-else()
+if(WIN32)
   target_link_libraries(${TARGET_NAME} dbghelp)
   add_dependencies(${TARGET_NAME} mock_gdi)
 endif()
 
 target_link_libraries(
-                      ${TARGET_NAME} ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE}
+                      ${TARGET_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME}
                       compute_runtime_mockable_extra ${HW_LIBS_ULT} gmock-gtest
 )
 
diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt
index 54e197a927..5adf101b28 100644
--- a/level_zero/tools/test/unit_tests/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/CMakeLists.txt
@@ -66,7 +66,7 @@ else()
 endif()
 
 target_link_libraries(${TARGET_NAME}
-                      ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE}
+                      ${NEO_SHARED_MOCKABLE_LIB_NAME}
                       compute_runtime_mockable_extra
                       ${HW_LIBS_ULT}
                       gmock-gtest
diff --git a/opencl/source/CMakeLists.txt b/opencl/source/CMakeLists.txt
index 0266eefa6d..f3f16703f7 100644
--- a/opencl/source/CMakeLists.txt
+++ b/opencl/source/CMakeLists.txt
@@ -66,14 +66,12 @@ if(WIN32 OR NOT DISABLE_WDDM_LINUX)
 endif()
 
 if(WIN32)
-  set(IGDRCL_EXTRA_LIBS Ws2_32)
   target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
                              ${NEO_SHARED_DIRECTORY}/os_interface/windows
                              ${NEO_SOURCE_DIR}/opencl/source/os_interface/windows
   )
   target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC OGL=1)
 else()
-  set(IGDRCL_EXTRA_LIBS dl pthread)
   target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
                              ${NEO_SHARED_DIRECTORY}/os_interface/linux
                              ${NEO_SOURCE_DIR}/opencl/source/os_interface/linux
@@ -171,7 +169,7 @@ if(${GENERATE_EXECUTABLE})
 
   add_subdirectory(dll)
 
-  target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME} ${NEO_SHARED_LIB} ${NEO_STATIC_LIB_NAME} ${NEO_SHARED_LIB} ${IGDRCL_EXTRA_LIBS})
+  target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME} ${NEO_SHARED_LIB} ${NEO_STATIC_LIB_NAME} ${NEO_SHARED_LIB} ${NEO_EXTRA_LIBS})
 
   target_include_directories(${NEO_DYNAMIC_LIB_NAME} BEFORE PRIVATE
                              ${CMAKE_CURRENT_BINARY_DIR}
@@ -225,4 +223,3 @@ if(UNIX AND NOT (TARGET clang-tidy))
   )
 endif()
 
-set(IGDRCL_EXTRA_LIBS ${IGDRCL_EXTRA_LIBS} PARENT_SCOPE)
diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt
index 135547bc74..49d58fdcea 100644
--- a/opencl/test/unit_test/CMakeLists.txt
+++ b/opencl/test/unit_test/CMakeLists.txt
@@ -9,6 +9,7 @@ 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)
 
@@ -28,7 +29,6 @@ add_dependencies(unit_tests copy_test_files_per_product)
 
 set(IGDRCL_SRCS_tests_local
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
     ${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
@@ -107,7 +107,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 ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
+target_link_libraries(igdrcl_tests ${OPENCL_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
 target_link_libraries(igdrcl_tests igdrcl_mocks)
 
 target_include_directories(igdrcl_tests PRIVATE
@@ -122,7 +122,7 @@ if(WIN32)
   )
 endif()
 
-target_link_libraries(igdrcl_tests gmock-gtest ${IGDRCL_EXTRA_LIBS})
+target_link_libraries(igdrcl_tests gmock-gtest ${NEO_EXTRA_LIBS})
 
 set(BUILT_IN_KERNEL_DIR "${NEO_SOURCE_DIR}/shared/source/built_ins")
 
diff --git a/opencl/test/unit_test/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt
index 2db296a52e..1dd26fb3db 100644
--- a/opencl/test/unit_test/aub_tests/CMakeLists.txt
+++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt
@@ -11,7 +11,6 @@ set(OPENCL_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 get_property(NEO_SHARED_aub_tests_configurations GLOBAL PROPERTY NEO_SHARED_aub_tests_configurations)
 
 list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
-     ${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
@@ -77,9 +76,9 @@ copy_gmm_dll_for(igdrcl_aub_tests)
 add_subdirectories()
 
 target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
-target_link_libraries(igdrcl_aub_tests ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
+target_link_libraries(igdrcl_aub_tests ${OPENCL_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
 target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
-target_link_libraries(igdrcl_aub_tests gmock-gtest ${IGDRCL_EXTRA_LIBS})
+target_link_libraries(igdrcl_aub_tests gmock-gtest ${NEO_EXTRA_LIBS})
 if(UNIX)
   target_link_libraries(igdrcl_aub_tests ${GMM_LINK_NAME})
 else()
diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt
index d012225fca..4197e2533c 100644
--- a/opencl/test/unit_test/libult/CMakeLists.txt
+++ b/opencl/test/unit_test/libult/CMakeLists.txt
@@ -65,8 +65,8 @@ foreach(target_name igdrcl_libult igdrcl_libult_env)
   set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE ON)
   set_target_properties(${target_name} PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
   set_property(TARGET ${target_name} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
-  target_include_directories(${target_name} PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
-  target_compile_definitions(${target_name} PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
+  target_include_directories(${target_name} PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
+  target_compile_definitions(${target_name} PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
   create_project_source_tree(${target_name})
 endforeach()
 
diff --git a/opencl/test/unit_test/linux/CMakeLists.txt b/opencl/test/unit_test/linux/CMakeLists.txt
index e55676cc0b..b088fa0623 100644
--- a/opencl/test/unit_test/linux/CMakeLists.txt
+++ b/opencl/test/unit_test/linux/CMakeLists.txt
@@ -35,7 +35,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} ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE} igdrcl_mocks ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE} ${IGDRCL_EXTRA_LIBS} gmock-gtest)
+target_link_libraries(igdrcl_${target_name} ${OPENCL_STATICALLY_LINKED_LIBRARIES_MOCKABLE} igdrcl_mocks ${OPENCL_STATICALLY_LINKED_LIBRARIES_MOCKABLE} ${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 81a6dd69b6..dcd14bae97 100644
--- a/opencl/test/unit_test/mt_tests/CMakeLists.txt
+++ b/opencl/test/unit_test/mt_tests/CMakeLists.txt
@@ -11,7 +11,6 @@ set(OPENCL_MT_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 add_custom_target(run_mt_unit_tests)
 add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
                ${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
@@ -36,10 +35,10 @@ target_include_directories(igdrcl_mt_tests PRIVATE
 add_subdirectories()
 
 target_link_libraries(igdrcl_mt_tests ${TSAN_LIB})
-target_link_libraries(igdrcl_mt_tests ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
+target_link_libraries(igdrcl_mt_tests ${OPENCL_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
 target_link_libraries(igdrcl_mt_tests gmock-gtest)
-target_link_libraries(igdrcl_mt_tests igdrcl_mocks ${IGDRCL_EXTRA_LIBS})
-target_link_libraries(igdrcl_mt_tests ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
+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 0a39bb53ef..762ca44698 100644
--- a/opencl/test/unit_test/windows/CMakeLists.txt
+++ b/opencl/test/unit_test/windows/CMakeLists.txt
@@ -38,7 +38,7 @@ if(WIN32)
                  ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
   )
 
-  target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})
+  target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${NEO_EXTRA_LIBS})
 
   target_include_directories(igdrcl_windows_dll_tests PRIVATE
                              ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
diff --git a/shared/source/CMakeLists.txt b/shared/source/CMakeLists.txt
index abd64b4599..f45bcbbc48 100644
--- a/shared/source/CMakeLists.txt
+++ b/shared/source/CMakeLists.txt
@@ -18,7 +18,7 @@ function(generate_shared_lib LIB_NAME MOCKABLE)
               ${CORE_SOURCES}
   )
   if(${MOCKABLE})
-    target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual)
+    target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual DEFAULT_TEST_PLATFORM=${DEFAULT_TESTED_PLATFORM} DEFAULT_TEST_FAMILY_NAME=${DEFAULT_TESTED_FAMILY_NAME} ${TESTED_GEN_FLAGS_DEFINITONS})
   else()
     target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
   endif()
diff --git a/shared/source/dll/linux/os_interface.cpp b/shared/source/dll/linux/os_interface.cpp
index 0fe435e7f8..f1f8cc87d9 100644
--- a/shared/source/dll/linux/os_interface.cpp
+++ b/shared/source/dll/linux/os_interface.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/os_interface/os_interface.h"
 
 #include "shared/source/gmm_helper/gmm_interface.h"
-#include "shared/source/os_interface/linux/drm_neo.h"
 
 namespace NEO {
 
diff --git a/shared/source/dll/windows/os_interface.cpp b/shared/source/dll/windows/os_interface.cpp
index e0470f299d..0a945ec800 100644
--- a/shared/source/dll/windows/os_interface.cpp
+++ b/shared/source/dll/windows/os_interface.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/os_interface/os_interface.h"
 
 #include "shared/source/helpers/constants.h"
-#include "shared/source/os_interface/windows/wddm/wddm.h"
 
 namespace NEO {
 
diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt
index bd9c25042e..86ef4b7514 100644
--- a/shared/test/common/libult/CMakeLists.txt
+++ b/shared/test/common/libult/CMakeLists.txt
@@ -141,6 +141,7 @@ elseif(UNIX)
 endif()
 
 set(neo_libult_SRCS_LINUX
+    ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/linux/mock_drm_memory_manager.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/linux/mock_drm_memory_manager.h
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/create_drm_memory_manager.cpp
@@ -151,6 +152,7 @@ set(neo_libult_SRCS_LINUX
 
 set_property(GLOBAL APPEND PROPERTY neo_libult_SRCS_LINUX ${neo_libult_SRCS_LINUX})
 set(neo_libult_SRCS_WINDOWS
+    ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_wddm.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/create_wddm_memory_manager.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/options.cpp
@@ -182,7 +184,6 @@ foreach(target_name "neo_libult_common" "neo_libult")
                              ${IGC_COMMON_PARENT_DIR}
   )
   target_compile_definitions(${target_name} PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
-
   create_project_source_tree(${target_name})
 endforeach()
 
diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt
index 288b786882..feef290143 100644
--- a/shared/test/unit_test/CMakeLists.txt
+++ b/shared/test/unit_test/CMakeLists.txt
@@ -39,12 +39,6 @@ if(NOT SKIP_UNIT_TESTS)
                  $<TARGET_OBJECTS:neo_libult>
   )
 
-  if(UNIX)
-    target_sources(${TARGET_NAME} PRIVATE
-                   ${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
-    )
-  endif()
-
   set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
   set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}")
 
@@ -56,16 +50,14 @@ if(NOT SKIP_UNIT_TESTS)
                              ${IGC_COMMON_PARENT_DIR}
   )
 
-  if(UNIX)
-    target_link_libraries(${TARGET_NAME} pthread rt)
-  else()
+  if(WIN32)
     target_link_libraries(${TARGET_NAME} dbghelp)
   endif()
 
   target_link_libraries(${TARGET_NAME}
                         gmock-gtest
-                        ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE}
-                        compute_runtime_mockable_extra
+                        ${NEO_SHARED_MOCKABLE_LIB_NAME}
+                        ${NEO_EXTRA_LIBS}
   )
 
   if(MSVC)