diff --git a/unit_tests/os_interface/linux/CMakeLists.txt b/unit_tests/os_interface/linux/CMakeLists.txt
index e01bdbfc48..57f62e76e3 100644
--- a/unit_tests/os_interface/linux/CMakeLists.txt
+++ b/unit_tests/os_interface/linux/CMakeLists.txt
@@ -40,7 +40,6 @@ set(IGDRCL_SRCS_tests_os_interface_linux
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_time_linux.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_linux.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_context_linux_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_linux_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_time_test.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux_tests.cpp
diff --git a/unit_tests/os_interface/linux/os_context_linux_tests.cpp b/unit_tests/os_interface/linux/os_context_linux_tests.cpp
deleted file mode 100644
index a78f23b9d4..0000000000
--- a/unit_tests/os_interface/linux/os_context_linux_tests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2018, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "runtime/os_interface/os_context.h"
-#include "runtime/os_interface/os_interface.h"
-#include "gtest/gtest.h"
-
-namespace OCLRT {
-
-TEST(OsContextTest, WhenOsContextIsCreatedThenImplIsAvailable) {
-    OSInterface osInterface;
-    auto osContext2 = std::make_unique<OsContext>(osInterface);
-    EXPECT_NE(nullptr, osContext2->get());
-}
-} // namespace OCLRT
diff --git a/unit_tests/os_interface/linux/os_interface_linux_tests.cpp b/unit_tests/os_interface/linux/os_interface_linux_tests.cpp
index 1ce2d3cd7c..9d5ef8569f 100644
--- a/unit_tests/os_interface/linux/os_interface_linux_tests.cpp
+++ b/unit_tests/os_interface/linux/os_interface_linux_tests.cpp
@@ -20,6 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include "runtime/os_interface/os_context.h"
 #include "runtime/os_interface/os_interface.h"
 #include "gtest/gtest.h"
 
@@ -33,4 +34,10 @@ TEST(OsInterfaceTest, GivenLinuxOsInterfaceWhenDeviceHandleQueriedthenZeroIsRetu
     OSInterface osInterface;
     EXPECT_EQ(0u, osInterface.getDeviceHandle());
 }
+
+TEST(OsContextTest, WhenOsContextIsCreatedThenImplIsAvailable) {
+    OSInterface osInterface;
+    auto osContext = std::make_unique<OsContext>(osInterface);
+    EXPECT_NE(nullptr, osContext->get());
+}
 } // namespace OCLRT
\ No newline at end of file
diff --git a/unit_tests/os_interface/windows/CMakeLists.txt b/unit_tests/os_interface/windows/CMakeLists.txt
index 476f9709c5..b74f4c028a 100644
--- a/unit_tests/os_interface/windows/CMakeLists.txt
+++ b/unit_tests/os_interface/windows/CMakeLists.txt
@@ -35,7 +35,6 @@ set(IGDRCL_SRCS_tests_os_interface_windows
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_memory_manager.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_context_win_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_library_win_tests.cpp
diff --git a/unit_tests/os_interface/windows/os_context_win_tests.cpp b/unit_tests/os_interface/windows/os_context_win_tests.cpp
deleted file mode 100644
index 907efcd9c0..0000000000
--- a/unit_tests/os_interface/windows/os_context_win_tests.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2018, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "unit_tests/os_interface/windows/wddm_fixture.h"
-#include "runtime/os_interface/windows/os_context_win.h"
-#include "runtime/os_interface/windows/os_interface.h"
-
-TEST(OsContextTest, givenWddmWhenCreateOsContextBeforeInitWddmThenOsContextIsNotInitialized) {
-    auto wddm = new WddmMock;
-    OSInterface osInterface;
-    osInterface.get()->setWddm(wddm);
-    auto osContext = std::make_unique<OsContext>(osInterface);
-    EXPECT_NE(nullptr, osContext->get());
-    EXPECT_FALSE(osContext->get()->isInitialized());
-}
-
-TEST(OsContextTest, givenWddmWhenCreateOsContextAfterInitWddmThenOsContextIsInitialized) {
-    auto wddm = new WddmMock;
-    OSInterface osInterface;
-    osInterface.get()->setWddm(wddm);
-    wddm->init();
-    auto osContext = std::make_unique<OsContext>(osInterface);
-    EXPECT_NE(nullptr, osContext->get());
-    EXPECT_TRUE(osContext->get()->isInitialized());
-}
diff --git a/unit_tests/os_interface/windows/os_interface_win_tests.cpp b/unit_tests/os_interface/windows/os_interface_win_tests.cpp
index 33be33373b..c0f363bea1 100644
--- a/unit_tests/os_interface/windows/os_interface_win_tests.cpp
+++ b/unit_tests/os_interface/windows/os_interface_win_tests.cpp
@@ -20,7 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include "runtime/os_interface/windows/os_context_win.h"
 #include "unit_tests/os_interface/windows/os_interface_win_tests.h"
+#include "unit_tests/os_interface/windows/wddm_fixture.h"
 
 TEST_F(OsInterfaceTest, givenOsInterfaceWithoutWddmWhenGetHwContextIdIsCalledThenReturnsZero) {
     auto retVal = osInterface->getHwContextId();
@@ -37,3 +39,22 @@ TEST_F(OsInterfaceTest, GivenWindowsWhenCreateEentIsCalledThenValidEventHandleIs
     auto ret = osInterface->get()->closeHandle(ev);
     EXPECT_EQ(TRUE, ret);
 }
+
+TEST(OsContextTest, givenWddmWhenCreateOsContextBeforeInitWddmThenOsContextIsNotInitialized) {
+    auto wddm = new WddmMock;
+    OSInterface osInterface;
+    osInterface.get()->setWddm(wddm);
+    auto osContext = std::make_unique<OsContext>(osInterface);
+    EXPECT_NE(nullptr, osContext->get());
+    EXPECT_FALSE(osContext->get()->isInitialized());
+}
+
+TEST(OsContextTest, givenWddmWhenCreateOsContextAfterInitWddmThenOsContextIsInitialized) {
+    auto wddm = new WddmMock;
+    OSInterface osInterface;
+    osInterface.get()->setWddm(wddm);
+    wddm->init();
+    auto osContext = std::make_unique<OsContext>(osInterface);
+    EXPECT_NE(nullptr, osContext->get());
+    EXPECT_TRUE(osContext->get()->isInitialized());
+}