diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index fbc0a55f0b..b926dd61db 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -452,6 +452,7 @@ endmacro()
 apply_macro_for_each_gen("TESTED")
 add_subdirectories()
 add_dependencies(unit_tests mock_gmm)
+add_dependencies(igdrcl_tests mock_gmm)
 create_project_source_tree(igdrcl_tests ${IGDRCL_SOURCE_DIR}/runtime)
 
 set(UltPchHeader "${CMAKE_CURRENT_SOURCE_DIR}/igdrcl_tests_pch.h")
diff --git a/unit_tests/mocks/gl/CMakeLists.txt b/unit_tests/mocks/gl/CMakeLists.txt
index 4b24f9c07a..918edb7599 100644
--- a/unit_tests/mocks/gl/CMakeLists.txt
+++ b/unit_tests/mocks/gl/CMakeLists.txt
@@ -21,8 +21,9 @@ if(WIN32)
 
   add_library(mock_opengl32 SHARED ${IGDRCL_SRCS_mock_opengl32})
   add_dependencies(unit_tests mock_opengl32)
+  add_dependencies(igdrcl_tests mock_opengl32)
   set_target_properties(mock_opengl32 PROPERTIES FOLDER "test mocks")
-  target_include_directories(mock_opengl32 PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>) 
-  target_compile_definitions(mock_opengl32 PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>) 
+  target_include_directories(mock_opengl32 PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
+  target_compile_definitions(mock_opengl32 PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
 endif()