diff --git a/level_zero/core/test/unit_tests/mocks/mock_fence.h b/level_zero/core/test/unit_tests/mocks/mock_fence.h
index bbab67447e..bc10bd6a5b 100644
--- a/level_zero/core/test/unit_tests/mocks/mock_fence.h
+++ b/level_zero/core/test/unit_tests/mocks/mock_fence.h
@@ -11,8 +11,6 @@
 #include "level_zero/core/source/fence/fence.h"
 #include "level_zero/core/test/unit_tests/white_box.h"
 
-#include "gtest/gtest.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/level_zero/core/test/unit_tests/mocks/mock_image.h b/level_zero/core/test/unit_tests/mocks/mock_image.h
index 81a66790a8..cf8d493cd7 100644
--- a/level_zero/core/test/unit_tests/mocks/mock_image.h
+++ b/level_zero/core/test/unit_tests/mocks/mock_image.h
@@ -10,8 +10,6 @@
 #include "level_zero/core/source/image/image_hw.h"
 #include "level_zero/core/test/unit_tests/white_box.h"
 
-#include "gtest/gtest.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h b/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h
index bd24dc4512..6b79575ab3 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h
@@ -19,8 +19,6 @@
 #include "level_zero/experimental/source/tracing/tracing_imp.h"
 #include <level_zero/zet_api.h>
 
-#include "gtest/gtest.h"
-
 #include <array>
 #include <iostream>
 
diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h
index 258619a448..96ea0ce389 100644
--- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h
+++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,8 +19,6 @@
 
 #include "opencl/test/unit_test/command_stream/command_stream_fixture.h"
 
-#include "gtest/gtest.h"
-
 #include <cstdint>
 
 namespace NEO {
diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h
index 890cfee1e9..d937b16d40 100644
--- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h
+++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h
@@ -23,8 +23,6 @@
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 
-#include "gtest/gtest.h"
-
 #include <sstream>
 
 namespace NEO {
diff --git a/opencl/test/unit_test/command_queue/buffer_operations_fixture.h b/opencl/test/unit_test/command_queue/buffer_operations_fixture.h
index 1e707c7eb0..a3d5183094 100644
--- a/opencl/test/unit_test/command_queue/buffer_operations_fixture.h
+++ b/opencl/test/unit_test/command_queue/buffer_operations_fixture.h
@@ -12,8 +12,6 @@
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct EnqueueWriteBufferTypeTest : public CommandEnqueueFixture,
diff --git a/opencl/test/unit_test/command_queue/command_queue_fixture.h b/opencl/test/unit_test/command_queue/command_queue_fixture.h
index e9a694d078..23047d40c8 100644
--- a/opencl/test/unit_test/command_queue/command_queue_fixture.h
+++ b/opencl/test/unit_test/command_queue/command_queue_fixture.h
@@ -15,7 +15,6 @@
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
 #include "CL/cl.h"
-#include "gtest/gtest.h"
 
 namespace NEO {
 class Device;
diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h
index 11c62a6097..db3c1a5680 100644
--- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h
+++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h
@@ -12,8 +12,6 @@
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct EnqueueCopyBufferHelper {
diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h
index 642d445cf1..5370096834 100644
--- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h
+++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h
@@ -12,8 +12,6 @@
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct EnqueueCopyBufferRectHelper {
diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h
index 62e87d8d03..b9acad054f 100644
--- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h
+++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,8 +14,6 @@
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct EnqueueCopyBufferToImageTest : public CommandEnqueueFixture,
diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h
index f826740471..6a242a923b 100644
--- a/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h
+++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,8 +14,6 @@
 #include "opencl/test/unit_test/fixtures/built_in_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct EnqueueCopyImageTest : public CommandEnqueueFixture,
diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h
index acfa036a4f..89c8feb46c 100644
--- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h
+++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,8 +14,6 @@
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct EnqueueCopyImageToBufferTest : public CommandEnqueueFixture,
diff --git a/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h
index 81f9ec948b..20e17dfc70 100644
--- a/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h
+++ b/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,8 +11,6 @@
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct EnqueueMapBufferTypeTest : public CommandEnqueueFixture,
diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h
index f99c1e5679..c71cccdb7d 100644
--- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h
+++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,8 +11,6 @@
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct EnqueueReadBufferTypeTest : public CommandEnqueueFixture,
diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h
index 06f0f57f2b..db7922db30 100644
--- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h
+++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h
@@ -13,8 +13,6 @@
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct EnqueueReadBufferRectTest : public CommandEnqueueFixture,
diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h
index c6a923cf41..8f564db1d3 100644
--- a/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h
+++ b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,8 +14,6 @@
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct EnqueueReadImageTest : public CommandEnqueueFixture,
diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h
index 79a1263ba0..302604ae4c 100644
--- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h
+++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h
@@ -14,8 +14,6 @@
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct EnqueueWriteBufferRectTest : public CommandEnqueueFixture,
diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h
index d136452ddc..d7d10c6e13 100644
--- a/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h
+++ b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,8 +14,6 @@
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct EnqueueWriteImageTest : public CommandEnqueueFixture,
diff --git a/opencl/test/unit_test/context/driver_diagnostics_tests.h b/opencl/test/unit_test/context/driver_diagnostics_tests.h
index cb5140703a..da7e1316f8 100644
--- a/opencl/test/unit_test/context/driver_diagnostics_tests.h
+++ b/opencl/test/unit_test/context/driver_diagnostics_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -22,8 +22,6 @@
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 
-#include "gtest/gtest.h"
-
 using namespace NEO;
 
 const int maxHintCounter = 6;
diff --git a/opencl/test/unit_test/context/gl/context_gl_tests.h b/opencl/test/unit_test/context/gl/context_gl_tests.h
index 1a4a6e9892..4b2e58521d 100644
--- a/opencl/test/unit_test/context/gl/context_gl_tests.h
+++ b/opencl/test/unit_test/context/gl/context_gl_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,7 +11,6 @@
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 
-#include "gtest/gtest.h"
 #include <GL/gl.h>
 
 namespace NEO {
diff --git a/opencl/test/unit_test/event/event_fixture.h b/opencl/test/unit_test/event/event_fixture.h
index 27305824e9..5be39fcb18 100644
--- a/opencl/test/unit_test/event/event_fixture.h
+++ b/opencl/test/unit_test/event/event_fixture.h
@@ -21,8 +21,6 @@
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
-#include "gtest/gtest.h"
-
 using namespace NEO;
 
 struct EventTest
diff --git a/opencl/test/unit_test/fixtures/cl_preemption_fixture.h b/opencl/test/unit_test/fixtures/cl_preemption_fixture.h
index abb05e0bd9..3d3d7fb46f 100644
--- a/opencl/test/unit_test/fixtures/cl_preemption_fixture.h
+++ b/opencl/test/unit_test/fixtures/cl_preemption_fixture.h
@@ -11,8 +11,6 @@
 
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
 
-#include "gtest/gtest.h"
-
 #include <memory>
 
 namespace NEO {
diff --git a/opencl/test/unit_test/fixtures/device_info_fixture.h b/opencl/test/unit_test/fixtures/device_info_fixture.h
index 680f4bc184..2c595fd407 100644
--- a/opencl/test/unit_test/fixtures/device_info_fixture.h
+++ b/opencl/test/unit_test/fixtures/device_info_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,8 +10,6 @@
 
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct GetDeviceInfoMemCapabilitiesTest : ::testing::Test {
diff --git a/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h b/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h
index 0cd766fb70..9f65b9a3ca 100644
--- a/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h
+++ b/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,8 +9,6 @@
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
-#include "gtest/gtest.h"
-
 class EnqueueHandlerTest : public NEO::ClDeviceFixture,
                            public testing::Test {
   public:
diff --git a/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h
index 4923641518..03e9eac7e1 100644
--- a/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h
+++ b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h
@@ -20,7 +20,6 @@
 #include "opencl/test/unit_test/mocks/mock_program.h"
 
 #include "CL/cl.h"
-#include "gtest/gtest.h"
 
 namespace NEO {
 
diff --git a/opencl/test/unit_test/fixtures/scenario_test_fixture.h b/opencl/test/unit_test/fixtures/scenario_test_fixture.h
index 30d5a78213..e87c9344fc 100644
--- a/opencl/test/unit_test/fixtures/scenario_test_fixture.h
+++ b/opencl/test/unit_test/fixtures/scenario_test_fixture.h
@@ -13,8 +13,6 @@
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 
-#include "gtest/gtest.h"
-
 using namespace NEO;
 
 class ScenarioTest : public ::testing::Test,
diff --git a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h
index 098da89cb0..a440091f1a 100644
--- a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h
+++ b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h
@@ -21,7 +21,6 @@
 
 #include "CL/cl.h"
 #include "compiler_options.h"
-#include "gtest/gtest.h"
 
 #include <type_traits>
 
diff --git a/opencl/test/unit_test/gen_common/gen_commands_common_validation.h b/opencl/test/unit_test/gen_common/gen_commands_common_validation.h
index 9aa209228a..f3e7a5af20 100644
--- a/opencl/test/unit_test/gen_common/gen_commands_common_validation.h
+++ b/opencl/test/unit_test/gen_common/gen_commands_common_validation.h
@@ -11,8 +11,6 @@
 #include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 
-#include "gtest/gtest.h"
-
 #include <cstdint>
 
 namespace NEO {
diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h
index 1a0c1164d5..9a47a88f95 100644
--- a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h
+++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h
@@ -17,7 +17,6 @@
 #include "opencl/test/unit_test/mocks/mock_program.h"
 
 #include "CL/cl.h"
-#include "gtest/gtest.h"
 
 #include <memory>
 
diff --git a/opencl/test/unit_test/mocks/mock_d3d_objects.h b/opencl/test/unit_test/mocks/mock_d3d_objects.h
index 03e9b6ebf4..b43411377f 100644
--- a/opencl/test/unit_test/mocks/mock_d3d_objects.h
+++ b/opencl/test/unit_test/mocks/mock_d3d_objects.h
@@ -10,8 +10,6 @@
 
 #include "opencl/source/sharings/d3d/d3d_sharing.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 template <typename D3D>
 class MockD3DSharingFunctions : public D3DSharingFunctions<D3D> {
diff --git a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h
index 0084e98f4d..0830d6ea27 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h
+++ b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h
@@ -10,7 +10,6 @@
 #include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_fatbinary.h"
 
-#include "gtest/gtest.h"
 #include "mock/mock_argument_helper.h"
 
 #include <memory>
diff --git a/opencl/test/unit_test/offline_compiler/ocloc_fcl_facade_tests.h b/opencl/test/unit_test/offline_compiler/ocloc_fcl_facade_tests.h
index 034cbe18a3..a14f1bbbdc 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_fcl_facade_tests.h
+++ b/opencl/test/unit_test/offline_compiler/ocloc_fcl_facade_tests.h
@@ -9,7 +9,6 @@
 
 #include "shared/source/helpers/hw_info.h"
 
-#include "gtest/gtest.h"
 #include "mock/mock_argument_helper.h"
 
 namespace NEO {
diff --git a/opencl/test/unit_test/offline_compiler/ocloc_igc_facade_tests.h b/opencl/test/unit_test/offline_compiler/ocloc_igc_facade_tests.h
index 1c5ac38355..c8c2be1337 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_igc_facade_tests.h
+++ b/opencl/test/unit_test/offline_compiler/ocloc_igc_facade_tests.h
@@ -9,7 +9,6 @@
 
 #include "shared/source/helpers/hw_info.h"
 
-#include "gtest/gtest.h"
 #include "mock/mock_argument_helper.h"
 
 namespace NEO {
diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h
index 1810d60eaf..5309a876f4 100644
--- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h
+++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h
@@ -13,8 +13,6 @@
 
 #include "opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h"
 
-#include "gtest/gtest.h"
-
 #include <cstdint>
 #include <memory>
 
diff --git a/opencl/test/unit_test/offline_compiler/offline_linker_tests.h b/opencl/test/unit_test/offline_compiler/offline_linker_tests.h
index ba87820cb8..da469ca9a7 100644
--- a/opencl/test/unit_test/offline_compiler/offline_linker_tests.h
+++ b/opencl/test/unit_test/offline_compiler/offline_linker_tests.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "gtest/gtest.h"
 #include "mock/mock_argument_helper.h"
 #include "mock/mock_ocloc_igc_facade.h"
 #include "mock/mock_offline_linker.h"
diff --git a/opencl/test/unit_test/offline_compiler/stdout_capturer.h b/opencl/test/unit_test/offline_compiler/stdout_capturer.h
index c7db15d0d2..544762a1ee 100644
--- a/opencl/test/unit_test/offline_compiler/stdout_capturer.h
+++ b/opencl/test/unit_test/offline_compiler/stdout_capturer.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "gtest/gtest.h"
-
 #include <string>
 
 namespace NEO {
diff --git a/opencl/test/unit_test/perf_tests/api/api_tests.h b/opencl/test/unit_test/perf_tests/api/api_tests.h
index 929b36f1da..46edbe689d 100644
--- a/opencl/test/unit_test/perf_tests/api/api_tests.h
+++ b/opencl/test/unit_test/perf_tests/api/api_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,8 +14,6 @@
 #include "opencl/test/unit_test/perf_tests/fixtures/platform_fixture.h"
 #include "opencl/test/unit_test/perf_tests/perf_test_utils.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 struct api_fixture : public PlatformFixture,
diff --git a/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.h b/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.h
index 4c1e8de212..b674a834e5 100644
--- a/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.h
+++ b/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,6 @@
 #include "opencl/source/command_queue/command_queue.h"
 
 #include "CL/cl.h"
-#include "gtest/gtest.h"
 
 namespace NEO {
 
diff --git a/opencl/test/unit_test/perf_tests/perf_test_utils.h b/opencl/test/unit_test/perf_tests/perf_test_utils.h
index 04b6db2329..6b033e6bbd 100644
--- a/opencl/test/unit_test/perf_tests/perf_test_utils.h
+++ b/opencl/test/unit_test/perf_tests/perf_test_utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,6 @@
 #pragma once
 #include "shared/source/utilities/timer_util.h"
 
-#include "gtest/gtest.h"
-
 #include <stdint.h>
 
 extern const char *perfLogPath;
diff --git a/opencl/test/unit_test/program/program_tests.h b/opencl/test/unit_test/program/program_tests.h
index dcbf0a7a28..b5a8a1a93c 100644
--- a/opencl/test/unit_test/program/program_tests.h
+++ b/opencl/test/unit_test/program/program_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,8 +9,6 @@
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/fixtures/context_fixture.h"
 
-#include "gtest/gtest.h"
-
 #include <vector>
 
 class ProgramTests : public NEO::ClDeviceFixture,
diff --git a/shared/test/common/fixtures/preemption_fixture.h b/shared/test/common/fixtures/preemption_fixture.h
index 2ddaab584d..7992973b69 100644
--- a/shared/test/common/fixtures/preemption_fixture.h
+++ b/shared/test/common/fixtures/preemption_fixture.h
@@ -11,8 +11,6 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "gtest/gtest.h"
-
 #include <cinttypes>
 #include <memory>
 #include <type_traits>
diff --git a/shared/test/common/libult/linux/drm_mock.h b/shared/test/common/libult/linux/drm_mock.h
index 7e1c626798..72db499d54 100644
--- a/shared/test/common/libult/linux/drm_mock.h
+++ b/shared/test/common/libult/linux/drm_mock.h
@@ -16,7 +16,6 @@
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
 
 #include "drm/i915_drm.h"
-#include "gtest/gtest.h"
 
 #include <cstdio>
 #include <fstream>
diff --git a/shared/test/common/libult/linux/drm_query_mock.h b/shared/test/common/libult/linux/drm_query_mock.h
index 600536c88e..c117aa3fe0 100644
--- a/shared/test/common/libult/linux/drm_query_mock.h
+++ b/shared/test/common/libult/linux/drm_query_mock.h
@@ -13,8 +13,6 @@
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/libult/linux/drm_mock_prelim_context.h"
 
-#include "gtest/gtest.h"
-
 using namespace NEO;
 
 class DrmQueryMock : public DrmMock {
diff --git a/shared/test/common/mocks/mock_command_stream_receiver.h b/shared/test/common/mocks/mock_command_stream_receiver.h
index 5fd028a259..0754f82c25 100644
--- a/shared/test/common/mocks/mock_command_stream_receiver.h
+++ b/shared/test/common/mocks/mock_command_stream_receiver.h
@@ -19,8 +19,6 @@
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/helpers/dispatch_flags_helper.h"
 
-#include "gtest/gtest.h"
-
 #include <optional>
 #include <vector>
 
diff --git a/shared/test/common/mocks/mock_csr.h b/shared/test/common/mocks/mock_csr.h
index 7272fd0984..b6e7305023 100644
--- a/shared/test/common/mocks/mock_csr.h
+++ b/shared/test/common/mocks/mock_csr.h
@@ -10,8 +10,6 @@
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
-#include "gtest/gtest.h"
-
 #include <vector>
 
 using namespace NEO;
diff --git a/shared/test/common/mocks/mock_gfx_partition.h b/shared/test/common/mocks/mock_gfx_partition.h
index f307b2a7f7..2d21fff5c0 100644
--- a/shared/test/common/mocks/mock_gfx_partition.h
+++ b/shared/test/common/mocks/mock_gfx_partition.h
@@ -9,8 +9,6 @@
 
 #include "shared/source/memory_manager/gfx_partition.h"
 
-#include "gtest/gtest.h"
-
 using namespace NEO;
 
 class MockGfxPartition : public GfxPartition {
diff --git a/shared/test/common/mocks/mock_memory_operations_handler.h b/shared/test/common/mocks/mock_memory_operations_handler.h
index 6b833bb521..bcb5150e4b 100644
--- a/shared/test/common/mocks/mock_memory_operations_handler.h
+++ b/shared/test/common/mocks/mock_memory_operations_handler.h
@@ -10,8 +10,6 @@
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 
 class GraphicsAllocation;
diff --git a/shared/test/common/mocks/mock_tbx_csr.h b/shared/test/common/mocks/mock_tbx_csr.h
index d0129bba8f..d65e876765 100644
--- a/shared/test/common/mocks/mock_tbx_csr.h
+++ b/shared/test/common/mocks/mock_tbx_csr.h
@@ -13,8 +13,6 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/hw_info.h"
 
-#include "gtest/gtest.h"
-
 #include <string>
 
 namespace NEO {
diff --git a/shared/test/common/os_interface/linux/drm_command_stream_fixture.h b/shared/test/common/os_interface/linux/drm_command_stream_fixture.h
index c8a7c76085..4db6786e83 100644
--- a/shared/test/common/os_interface/linux/drm_command_stream_fixture.h
+++ b/shared/test/common/os_interface/linux/drm_command_stream_fixture.h
@@ -16,8 +16,6 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 
-#include "gtest/gtest.h"
-
 #include <algorithm>
 
 class DrmCommandStreamTest : public ::testing::Test {
diff --git a/shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h b/shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h
index 3e7de5f23d..417201bcf6 100644
--- a/shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h
+++ b/shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h
@@ -18,8 +18,6 @@
 #include "shared/test/common/os_interface/linux/drm_memory_manager_fixture.h"
 #include "shared/test/common/os_interface/linux/drm_mock_memory_info.h"
 
-#include "gtest/gtest.h"
-
 class DrmMemoryManagerLocalMemoryPrelimTest : public ::testing::Test {
   public:
     void SetUp() override {
diff --git a/shared/test/common/test_macros/test_checks_shared.h b/shared/test/common/test_macros/test_checks_shared.h
index a995164872..ea2ef7b818 100644
--- a/shared/test/common/test_macros/test_checks_shared.h
+++ b/shared/test/common/test_macros/test_checks_shared.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,6 @@
 #pragma once
 #include "shared/source/helpers/constants.h"
 
-#include "gtest/gtest.h"
-
 #include <memory>
 
 namespace NEO {
diff --git a/shared/test/unit_test/os_interface/hw_info_config_tests.h b/shared/test/unit_test/os_interface/hw_info_config_tests.h
index bf3107c263..7600ec140f 100644
--- a/shared/test/unit_test/os_interface/hw_info_config_tests.h
+++ b/shared/test/unit_test/os_interface/hw_info_config_tests.h
@@ -10,8 +10,6 @@
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "gtest/gtest.h"
-
 using namespace NEO;
 
 struct HwInfoConfigTest : public ::testing::Test {
diff --git a/shared/test/unit_test/os_interface/linux/drm_mock_impl.h b/shared/test/unit_test/os_interface/linux/drm_mock_impl.h
index b76eeb3dd8..b514ca0312 100644
--- a/shared/test/unit_test/os_interface/linux/drm_mock_impl.h
+++ b/shared/test/unit_test/os_interface/linux/drm_mock_impl.h
@@ -10,7 +10,6 @@
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 
-#include "gtest/gtest.h"
 #include "test_traits_common.h"
 
 using namespace NEO;
diff --git a/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h b/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h
index 423eed5596..ab2e0d7401 100644
--- a/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h
+++ b/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h
@@ -11,8 +11,6 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
-#include "gtest/gtest.h"
-
 #include <memory>
 
 namespace NEO {
diff --git a/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h b/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h
index 3ebd97da1c..cbdf36900c 100644
--- a/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h
+++ b/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h
@@ -15,8 +15,6 @@
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include <gtest/gtest.h>
-
 template <typename GfxFamily>
 class SourceLevelDebuggerPreambleTest {
   public:
diff --git a/shared/test/unit_test/test_stats.h b/shared/test/unit_test/test_stats.h
index 2efe648ee9..2180fd15ce 100644
--- a/shared/test/unit_test/test_stats.h
+++ b/shared/test/unit_test/test_stats.h
@@ -6,7 +6,6 @@
  */
 
 #pragma once
-#include "gtest/gtest.h"
 
 #include <sstream>
 #include <string>