diff --git a/unit_tests/gen8/cmd_parse_gen8.cpp b/unit_tests/gen8/cmd_parse_gen8.cpp
index 6454935366..95272ca553 100644
--- a/unit_tests/gen8/cmd_parse_gen8.cpp
+++ b/unit_tests/gen8/cmd_parse_gen8.cpp
@@ -431,5 +431,7 @@ void BdwParse::validateCommand<MEDIA_VFE_STATE *>(GenCmdList::iterator itorBegin
     ASSERT_TRUE(false) << "A PIPE_CONTROL w/ CS stall is required before a MEDIA_VFE_STATE.";
 }
 
+namespace OCLRT {
 template void HardwareParse::findHardwareCommands<BDWFamily>();
 template const void *HardwareParse::getStatelessArgumentPointer<BDWFamily>(const Kernel &kernel, uint32_t indexArg, IndirectHeap &ioh);
+} // namespace OCLRT
diff --git a/unit_tests/gen9/cmd_parse_gen9.cpp b/unit_tests/gen9/cmd_parse_gen9.cpp
index 57514fbb81..778078bf36 100644
--- a/unit_tests/gen9/cmd_parse_gen9.cpp
+++ b/unit_tests/gen9/cmd_parse_gen9.cpp
@@ -467,5 +467,7 @@ void SklParse::validateCommand<MEDIA_VFE_STATE *>(GenCmdList::iterator itorBegin
     ASSERT_TRUE(false) << "A PIPE_CONTROL w/ CS stall is required before a MEDIA_VFE_STATE.";
 }
 
+namespace OCLRT {
 template void HardwareParse::findHardwareCommands<SKLFamily>();
 template const void *HardwareParse::getStatelessArgumentPointer<SKLFamily>(const Kernel &kernel, uint32_t indexArg, IndirectHeap &ioh);
+} // namespace OCLRT