diff --git a/unit_tests/sharings/unified/CMakeLists.txt b/unit_tests/sharings/unified/CMakeLists.txt
index b5ef1deab1..f09a320221 100644
--- a/unit_tests/sharings/unified/CMakeLists.txt
+++ b/unit_tests/sharings/unified/CMakeLists.txt
@@ -8,6 +8,7 @@ set(IGDRCL_SRCS_tests_sharings_unified
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/unified_sharing_buffer_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/unified_sharing_fixtures.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/unified_sharing_mocks.h
   ${CMAKE_CURRENT_SOURCE_DIR}/unified_sharing_tests.cpp
 )
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_sharings_unified})
diff --git a/unit_tests/sharings/unified/unified_sharing_buffer_tests.cpp b/unit_tests/sharings/unified/unified_sharing_buffer_tests.cpp
index 34536c0cb5..2622867176 100644
--- a/unit_tests/sharings/unified/unified_sharing_buffer_tests.cpp
+++ b/unit_tests/sharings/unified/unified_sharing_buffer_tests.cpp
@@ -7,16 +7,12 @@
 
 #include "runtime/sharings/unified/unified_buffer.h"
 #include "unit_tests/sharings/unified/unified_sharing_fixtures.h"
+#include "unit_tests/sharings/unified/unified_sharing_mocks.h"
 
 using UnifiedSharingBufferTestsWithMemoryManager = UnifiedSharingFixture<true, true>;
 using UnifiedSharingBufferTestsWithInvalidMemoryManager = UnifiedSharingFixture<true, false>;
 
 TEST_F(UnifiedSharingBufferTestsWithMemoryManager, givenUnifiedBufferThenItCanBeAcquiredAndReleased) {
-    struct MockSharingHandler : UnifiedBuffer {
-        using UnifiedBuffer::acquireCount;
-        using UnifiedBuffer::UnifiedBuffer;
-    };
-
     cl_mem_flags flags{};
     UnifiedSharingMemoryDescription desc{};
     desc.handle = reinterpret_cast<void *>(0x1234);
@@ -25,7 +21,7 @@ TEST_F(UnifiedSharingBufferTestsWithMemoryManager, givenUnifiedBufferThenItCanBe
     ASSERT_EQ(CL_SUCCESS, retVal);
 
     UnifiedSharingFunctions sharingFunctions;
-    MockSharingHandler *sharingHandler = new MockSharingHandler(&sharingFunctions, UnifiedSharingHandleType::Win32Nt);
+    MockUnifiedBuffer *sharingHandler = new MockUnifiedBuffer(&sharingFunctions, UnifiedSharingHandleType::Win32Nt);
     buffer->setSharingHandler(sharingHandler);
 
     ASSERT_EQ(0u, sharingHandler->acquireCount);
diff --git a/unit_tests/sharings/unified/unified_sharing_mocks.h b/unit_tests/sharings/unified/unified_sharing_mocks.h
new file mode 100644
index 0000000000..4e05dc5f9c
--- /dev/null
+++ b/unit_tests/sharings/unified/unified_sharing_mocks.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include "runtime/sharings/unified/unified_buffer.h"
+
+namespace NEO {
+
+struct MockUnifiedBuffer : UnifiedBuffer {
+    using UnifiedBuffer::acquireCount;
+    using UnifiedBuffer::UnifiedBuffer;
+};
+
+} // namespace NEO