diff --git a/opencl/test/unit_test/gen11/windows/CMakeLists.txt b/opencl/test/unit_test/gen11/windows/CMakeLists.txt
deleted file mode 100644
index 9a4f6b87ca..0000000000
--- a/opencl/test/unit_test/gen11/windows/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (C) 2019-2021 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-set(IGDRCL_SRCS_tests_gen11_windows
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks_tests_gen11.cpp
-)
-if(WIN32)
-  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_windows})
-endif()
diff --git a/opencl/test/unit_test/gen12lp/windows/CMakeLists.txt b/opencl/test/unit_test/gen12lp/windows/CMakeLists.txt
deleted file mode 100644
index 0ece5959a3..0000000000
--- a/opencl/test/unit_test/gen12lp/windows/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (C) 2019-2022 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-set(IGDRCL_SRCS_tests_gen12lp_windows
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks_tests_gen12lp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_tests_gen12lp.cpp
-)
-if(WIN32)
-  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_windows})
-  add_subdirectories()
-endif()
diff --git a/opencl/test/unit_test/gen9/windows/CMakeLists.txt b/opencl/test/unit_test/gen9/windows/CMakeLists.txt
deleted file mode 100644
index 405da63ad2..0000000000
--- a/opencl/test/unit_test/gen9/windows/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (C) 2018-2020 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-set(IGDRCL_SRCS_tests_gen9_windows
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks_tests_gen9.cpp
-)
-if(WIN32)
-  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_windows})
-endif()
diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/windows/wddm_tests_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/windows/wddm_tests_dg2.cpp
index ab0d33931f..507a2ca7db 100644
--- a/opencl/test/unit_test/xe_hpg_core/dg2/windows/wddm_tests_dg2.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/dg2/windows/wddm_tests_dg2.cpp
@@ -23,8 +23,6 @@ using namespace NEO;
 
 #include "mock_gmm_memory.h"
 
-HWTEST_EXCLUDE_PRODUCT(PlatformWithFourDevicesTest, givenPlatformWithFourDevicesWhenCreateBufferThenAllocationIsColouredAndHasFourHandles, IGFX_DG2);
-
 struct PlatformWithFourDevicesTestDG2 : public ::testing::Test {
     PlatformWithFourDevicesTestDG2() {
         ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false;
diff --git a/shared/test/unit_test/gen11/windows/CMakeLists.txt b/shared/test/unit_test/gen11/windows/CMakeLists.txt
new file mode 100644
index 0000000000..6cf614be4c
--- /dev/null
+++ b/shared/test/unit_test/gen11/windows/CMakeLists.txt
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2022 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(WIN32)
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks_tests_gen11.cpp
+  )
+  add_subdirectories()
+endif()
diff --git a/opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp b/shared/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp
similarity index 92%
rename from opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp
rename to shared/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp
index baee7971f4..76cffe5f15 100644
--- a/opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp
+++ b/shared/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/shared/test/unit_test/gen12lp/windows/CMakeLists.txt b/shared/test/unit_test/gen12lp/windows/CMakeLists.txt
index dc25f2b039..276f5d1875 100644
--- a/shared/test/unit_test/gen12lp/windows/CMakeLists.txt
+++ b/shared/test/unit_test/gen12lp/windows/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 if(WIN32)
   target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks_tests_gen12lp.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_gen12lp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/wddm_tests_gen12lp.cpp
   )
+  add_subdirectories()
 endif()
diff --git a/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp
similarity index 99%
rename from opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp
rename to shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp
index 72709a9ca1..23aa48fbd1 100644
--- a/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp
+++ b/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp
similarity index 100%
rename from opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp
rename to shared/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp
diff --git a/shared/test/unit_test/gen9/windows/CMakeLists.txt b/shared/test/unit_test/gen9/windows/CMakeLists.txt
new file mode 100644
index 0000000000..ed5ab9f553
--- /dev/null
+++ b/shared/test/unit_test/gen9/windows/CMakeLists.txt
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2022 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(WIN32)
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks_tests_gen9.cpp
+  )
+  add_subdirectories()
+endif()
diff --git a/opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp b/shared/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp
similarity index 92%
rename from opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp
rename to shared/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp
index db89110fbb..751eb6dc6c 100644
--- a/opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp
+++ b/shared/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *