diff --git a/unit_tests/api/gl/cl_create_from_gl_texture_tests.cpp b/unit_tests/api/gl/cl_create_from_gl_texture_tests.cpp
index fa46dc1228..1d79926be6 100644
--- a/unit_tests/api/gl/cl_create_from_gl_texture_tests.cpp
+++ b/unit_tests/api/gl/cl_create_from_gl_texture_tests.cpp
@@ -1,12 +1,13 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "unit_tests/api/cl_api_tests.h"
-#include "unit_tests/mocks/gl/mock_gl_sharing.h"
+
+#include <GL/gl.h>
 
 using namespace NEO;
 
diff --git a/unit_tests/command_queue/gl/CMakeLists.txt b/unit_tests/command_queue/gl/CMakeLists.txt
index 098a9b092b..2ca111a141 100644
--- a/unit_tests/command_queue/gl/CMakeLists.txt
+++ b/unit_tests/command_queue/gl/CMakeLists.txt
@@ -1,13 +1,7 @@
 #
-# Copyright (C) 2017-2018 Intel Corporation
+# Copyright (C) 2017-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-if(WIN32)
-  set(IGDRCL_SRCS_tests_command_queue_gl
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_gl_tests.cpp
-  )
-  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_command_queue_gl})
-endif()
+add_subdirectories()
diff --git a/unit_tests/command_queue/gl/windows/CMakeLists.txt b/unit_tests/command_queue/gl/windows/CMakeLists.txt
new file mode 100644
index 0000000000..f04b1c39ab
--- /dev/null
+++ b/unit_tests/command_queue/gl/windows/CMakeLists.txt
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(WIN32)
+  set(IGDRCL_SRCS_tests_command_queue_gl_windows
+    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_gl_tests_windows.cpp
+  )
+  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_command_queue_gl_windows})
+endif()
diff --git a/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp b/unit_tests/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp
similarity index 97%
rename from unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp
rename to unit_tests/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp
index 4b1fe082e8..8146d8b8b4 100644
--- a/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp
+++ b/unit_tests/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp
@@ -14,7 +14,7 @@
 #include "unit_tests/fixtures/hello_world_fixture.h"
 #include "unit_tests/fixtures/memory_management_fixture.h"
 #include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/mocks/gl/mock_gl_sharing.h"
+#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
 #include "unit_tests/mocks/mock_buffer.h"
 #include "unit_tests/mocks/mock_csr.h"
 #include "unit_tests/mocks/mock_submissions_aggregator.h"
diff --git a/unit_tests/mock_gl/CMakeLists.txt b/unit_tests/mock_gl/CMakeLists.txt
new file mode 100644
index 0000000000..1e8ca6b45a
--- /dev/null
+++ b/unit_tests/mock_gl/CMakeLists.txt
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+add_subdirectories()
diff --git a/unit_tests/mock_gl/windows/CMakeLists.txt b/unit_tests/mock_gl/windows/CMakeLists.txt
new file mode 100644
index 0000000000..0c44c4dd60
--- /dev/null
+++ b/unit_tests/mock_gl/windows/CMakeLists.txt
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2017-2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(WIN32)
+  set(IGDRCL_SRCS_mock_opengl32
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.def
+    ${NEO_SOURCE_DIR}/unit_tests/helpers/windows/mock_function.cpp
+  )
+
+  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>)
+endif()
+
diff --git a/unit_tests/mocks/gl/mock_opengl32.cpp b/unit_tests/mock_gl/windows/mock_opengl32.cpp
similarity index 99%
rename from unit_tests/mocks/gl/mock_opengl32.cpp
rename to unit_tests/mock_gl/windows/mock_opengl32.cpp
index 426499024e..ef453a8071 100644
--- a/unit_tests/mocks/gl/mock_opengl32.cpp
+++ b/unit_tests/mock_gl/windows/mock_opengl32.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,7 @@
 #define _GDI32_ //It causes that definitions of functions are not loaded from dll in file wingdi.h because they are in this file.
 
 #include "unit_tests/helpers/windows/mock_function.h"
-#include "unit_tests/mocks/gl/mock_gl_sharing.h"
+#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
 
 #include "GL/gl.h"
 
diff --git a/unit_tests/mocks/gl/mock_opengl32.def b/unit_tests/mock_gl/windows/mock_opengl32.def
similarity index 97%
rename from unit_tests/mocks/gl/mock_opengl32.def
rename to unit_tests/mock_gl/windows/mock_opengl32.def
index ed4fbdec74..411e09ae86 100644
--- a/unit_tests/mocks/gl/mock_opengl32.def
+++ b/unit_tests/mock_gl/windows/mock_opengl32.def
@@ -1,4 +1,4 @@
-; Copyright (c) 2017, Intel Corporation
+; Copyright (c) 2017-2020, Intel Corporation
 ;
 ; Permission is hereby granted, free of charge, to any person obtaining a
 ; copy of this software and associated documentation files (the "Software"),
diff --git a/unit_tests/mocks/CMakeLists.txt b/unit_tests/mocks/CMakeLists.txt
index fbab443390..603994d140 100644
--- a/unit_tests/mocks/CMakeLists.txt
+++ b/unit_tests/mocks/CMakeLists.txt
@@ -102,9 +102,8 @@ else()
   )
 endif()
 
-add_subdirectories()
-
 add_library(igdrcl_mocks STATIC EXCLUDE_FROM_ALL ${IGDRCL_SRCS_tests_mocks})
+add_subdirectories()
 
 if(WIN32)
   target_include_directories(igdrcl_mocks PUBLIC
diff --git a/unit_tests/mocks/gl/CMakeLists.txt b/unit_tests/mocks/gl/CMakeLists.txt
index c53e045e74..2ca111a141 100644
--- a/unit_tests/mocks/gl/CMakeLists.txt
+++ b/unit_tests/mocks/gl/CMakeLists.txt
@@ -1,29 +1,7 @@
 #
-# Copyright (C) 2017-2019 Intel Corporation
+# Copyright (C) 2017-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-if(WIN32)
-  list (APPEND IGDRCL_SRCS_tests_mocks
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_sharing.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_sharing.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_arb_sync_event.h
-  )
-
-  set(IGDRCL_SRCS_tests_mocks "${IGDRCL_SRCS_tests_mocks}" PARENT_SCOPE)
-
-  set(IGDRCL_SRCS_mock_opengl32
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.def
-    ${NEO_SOURCE_DIR}/unit_tests/helpers/windows/mock_function.cpp
-  )
-
-  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>)
-endif()
-
+add_subdirectories()
diff --git a/unit_tests/mocks/gl/windows/CMakeLists.txt b/unit_tests/mocks/gl/windows/CMakeLists.txt
new file mode 100644
index 0000000000..c9a04b353f
--- /dev/null
+++ b/unit_tests/mocks/gl/windows/CMakeLists.txt
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2017-2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(WIN32)
+  list (APPEND IGDRCL_SRCS_tests_mocks_windows
+    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_arb_sync_event_windows.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_sharing_windows.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_sharing_windows.h
+  )
+  target_sources(igdrcl_mocks PRIVATE ${IGDRCL_SRCS_tests_mocks_windows})
+endif()
+
diff --git a/unit_tests/mocks/gl/mock_gl_arb_sync_event.h b/unit_tests/mocks/gl/windows/mock_gl_arb_sync_event_windows.h
similarity index 96%
rename from unit_tests/mocks/gl/mock_gl_arb_sync_event.h
rename to unit_tests/mocks/gl/windows/mock_gl_arb_sync_event_windows.h
index b979129ccc..e1221be3bd 100644
--- a/unit_tests/mocks/gl/mock_gl_arb_sync_event.h
+++ b/unit_tests/mocks/gl/windows/mock_gl_arb_sync_event_windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/unit_tests/mocks/gl/mock_gl_sharing.cpp b/unit_tests/mocks/gl/windows/mock_gl_sharing_windows.cpp
similarity index 95%
rename from unit_tests/mocks/gl/mock_gl_sharing.cpp
rename to unit_tests/mocks/gl/windows/mock_gl_sharing_windows.cpp
index 60c2360c65..d99338bbad 100644
--- a/unit_tests/mocks/gl/mock_gl_sharing.cpp
+++ b/unit_tests/mocks/gl/windows/mock_gl_sharing_windows.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "unit_tests/mocks/gl/mock_gl_sharing.h"
+#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
 
 #include "config.h"
 
diff --git a/unit_tests/mocks/gl/mock_gl_sharing.h b/unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h
similarity index 100%
rename from unit_tests/mocks/gl/mock_gl_sharing.h
rename to unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h
diff --git a/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp b/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp
index 55ecec4721..3d8c0a4e8b 100644
--- a/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp
+++ b/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp
@@ -15,7 +15,7 @@
 #include "runtime/os_interface/windows/wddm_memory_operations_handler.h"
 #include "runtime/sharings/gl/gl_arb_sync_event.h"
 #include "runtime/sharings/gl/windows/gl_sharing.h"
-#include "unit_tests/mocks/gl/mock_gl_sharing.h"
+#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
 #include "unit_tests/mocks/mock_execution_environment.h"
 #include "unit_tests/os_interface/windows/wddm_fixture.h"
 
diff --git a/unit_tests/sharings/gl/windows/gl_arb_sync_event_tests.cpp b/unit_tests/sharings/gl/windows/gl_arb_sync_event_tests.cpp
index bf0b1b078d..21864f119f 100644
--- a/unit_tests/sharings/gl/windows/gl_arb_sync_event_tests.cpp
+++ b/unit_tests/sharings/gl/windows/gl_arb_sync_event_tests.cpp
@@ -13,8 +13,8 @@
 #include "runtime/sharings/gl/gl_arb_sync_event.h"
 #include "runtime/sharings/sharing.h"
 #include "test.h"
-#include "unit_tests/mocks/gl/mock_gl_arb_sync_event.h"
-#include "unit_tests/mocks/gl/mock_gl_sharing.h"
+#include "unit_tests/mocks/gl/windows/mock_gl_arb_sync_event_windows.h"
+#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
 #include "unit_tests/mocks/mock_command_queue.h"
 #include "unit_tests/mocks/mock_context.h"
 #include "unit_tests/mocks/mock_csr.h"
diff --git a/unit_tests/sharings/gl/windows/gl_create_from_texture_tests.cpp b/unit_tests/sharings/gl/windows/gl_create_from_texture_tests.cpp
index 8568589602..26a74f9ceb 100644
--- a/unit_tests/sharings/gl/windows/gl_create_from_texture_tests.cpp
+++ b/unit_tests/sharings/gl/windows/gl_create_from_texture_tests.cpp
@@ -12,7 +12,7 @@
 #include "test.h"
 #include "unit_tests/libult/create_command_stream.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
-#include "unit_tests/mocks/gl/mock_gl_sharing.h"
+#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
 #include "unit_tests/mocks/mock_context.h"
 #include "unit_tests/mocks/mock_execution_environment.h"
 #include "unit_tests/mocks/mock_gmm.h"
diff --git a/unit_tests/sharings/gl/windows/gl_reused_buffers_tests.cpp b/unit_tests/sharings/gl/windows/gl_reused_buffers_tests.cpp
index bc659ee8dd..1dcce4aed9 100644
--- a/unit_tests/sharings/gl/windows/gl_reused_buffers_tests.cpp
+++ b/unit_tests/sharings/gl/windows/gl_reused_buffers_tests.cpp
@@ -10,7 +10,7 @@
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/sharings/gl/gl_buffer.h"
 #include "test.h"
-#include "unit_tests/mocks/gl/mock_gl_sharing.h"
+#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
 #include "unit_tests/mocks/mock_context.h"
 #include "unit_tests/mocks/mock_memory_manager.h"
 
diff --git a/unit_tests/sharings/gl/windows/gl_sharing_tests.cpp b/unit_tests/sharings/gl/windows/gl_sharing_tests.cpp
index d7cce67f9f..6801d3a218 100644
--- a/unit_tests/sharings/gl/windows/gl_sharing_tests.cpp
+++ b/unit_tests/sharings/gl/windows/gl_sharing_tests.cpp
@@ -26,8 +26,8 @@
 #include "test.h"
 #include "unit_tests/libult/create_command_stream.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
-#include "unit_tests/mocks/gl/mock_gl_arb_sync_event.h"
-#include "unit_tests/mocks/gl/mock_gl_sharing.h"
+#include "unit_tests/mocks/gl/windows/mock_gl_arb_sync_event_windows.h"
+#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
 #include "unit_tests/mocks/mock_async_event_handler.h"
 #include "unit_tests/mocks/mock_command_queue.h"
 #include "unit_tests/mocks/mock_context.h"
diff --git a/unit_tests/sharings/gl/windows/gl_texture_tests.cpp b/unit_tests/sharings/gl/windows/gl_texture_tests.cpp
index fd565ab456..490289b46f 100644
--- a/unit_tests/sharings/gl/windows/gl_texture_tests.cpp
+++ b/unit_tests/sharings/gl/windows/gl_texture_tests.cpp
@@ -11,7 +11,7 @@
 #include "runtime/sharings/gl/gl_texture.h"
 #include "unit_tests/libult/create_command_stream.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
-#include "unit_tests/mocks/gl/mock_gl_sharing.h"
+#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
 #include "unit_tests/mocks/mock_context.h"
 #include "unit_tests/mocks/mock_gmm.h"
 #include "unit_tests/mocks/mock_memory_manager.h"