diff --git a/opencl/test/unit_test/os_interface/CMakeLists.txt b/opencl/test/unit_test/os_interface/CMakeLists.txt
index bbee44fbe3..c0b787cfe1 100644
--- a/opencl/test/unit_test/os_interface/CMakeLists.txt
+++ b/opencl/test/unit_test/os_interface/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -19,9 +19,6 @@ set(IGDRCL_SRCS_tests_os_interface_base
     ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_tests.cpp
 )
 
-get_property(NEO_CORE_OS_INTERFACE_AUB_TESTS GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_AUB_TESTS)
-list(APPEND IGDRCL_SRCS_tests_os_interface_base ${NEO_CORE_OS_INTERFACE_AUB_TESTS})
-
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_os_interface_base})
 set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_os_interface_base ${IGDRCL_SRCS_tests_os_interface_base})
 add_subdirectories()
diff --git a/shared/test/unit_test/os_interface/CMakeLists.txt b/shared/test/unit_test/os_interface/CMakeLists.txt
index 5865a1e72e..78536a2e1a 100644
--- a/shared/test/unit_test/os_interface/CMakeLists.txt
+++ b/shared/test/unit_test/os_interface/CMakeLists.txt
@@ -16,9 +16,12 @@ set(NEO_CORE_OS_INTERFACE_TESTS
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_TESTS ${NEO_CORE_OS_INTERFACE_TESTS})
-target_sources(${TARGET_NAME} PRIVATE
-               ${NEO_CORE_OS_INTERFACE_TESTS}
-)
 
 set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_AUB_TESTS ${NEO_CORE_OS_INTERFACE_AUB_TESTS})
+
+target_sources(${TARGET_NAME} PRIVATE
+               ${NEO_CORE_OS_INTERFACE_TESTS}
+               ${NEO_CORE_OS_INTERFACE_AUB_TESTS}
+)
+
 add_subdirectories()