diff --git a/shared/test/common/gen11/ehl/mock_product_helper_ehl.cpp b/shared/test/common/gen11/ehl/mock_product_helper_ehl.cpp
index 1b19e41f3b..7450366cd7 100644
--- a/shared/test/common/gen11/ehl/mock_product_helper_ehl.cpp
+++ b/shared/test/common/gen11/ehl/mock_product_helper_ehl.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
 
 constexpr static auto gfxProduct = IGFX_ELKHARTLAKE;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen11/icllp/mock_product_helper_icllp.cpp b/shared/test/common/gen11/icllp/mock_product_helper_icllp.cpp
index 3d5d12b263..9c3c19a91f 100644
--- a/shared/test/common/gen11/icllp/mock_product_helper_icllp.cpp
+++ b/shared/test/common/gen11/icllp/mock_product_helper_icllp.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
 
 constexpr static auto gfxProduct = IGFX_ICELAKE_LP;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen11/lkf/mock_product_helper_lkf.cpp b/shared/test/common/gen11/lkf/mock_product_helper_lkf.cpp
index 824da0925f..17ed0b1d35 100644
--- a/shared/test/common/gen11/lkf/mock_product_helper_lkf.cpp
+++ b/shared/test/common/gen11/lkf/mock_product_helper_lkf.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
 
 constexpr static auto gfxProduct = IGFX_LAKEFIELD;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen12lp/adln/mock_product_helper_adln.cpp b/shared/test/common/gen12lp/adln/mock_product_helper_adln.cpp
index c691a86adf..14cbcc833c 100644
--- a/shared/test/common/gen12lp/adln/mock_product_helper_adln.cpp
+++ b/shared/test/common/gen12lp/adln/mock_product_helper_adln.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
 
 constexpr static auto gfxProduct = IGFX_ALDERLAKE_N;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen12lp/adlp/mock_product_helper_adlp.cpp b/shared/test/common/gen12lp/adlp/mock_product_helper_adlp.cpp
index 1ec76ac3e2..9ab13c722c 100644
--- a/shared/test/common/gen12lp/adlp/mock_product_helper_adlp.cpp
+++ b/shared/test/common/gen12lp/adlp/mock_product_helper_adlp.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
 
 constexpr static auto gfxProduct = IGFX_ALDERLAKE_P;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen12lp/adls/mock_product_helper_adls.cpp b/shared/test/common/gen12lp/adls/mock_product_helper_adls.cpp
index 65b293258e..418f230dc1 100644
--- a/shared/test/common/gen12lp/adls/mock_product_helper_adls.cpp
+++ b/shared/test/common/gen12lp/adls/mock_product_helper_adls.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
 
 constexpr static auto gfxProduct = IGFX_ALDERLAKE_S;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen12lp/dg1/mock_product_helper_dg1.cpp b/shared/test/common/gen12lp/dg1/mock_product_helper_dg1.cpp
index 80fee49472..ef6b3a211c 100644
--- a/shared/test/common/gen12lp/dg1/mock_product_helper_dg1.cpp
+++ b/shared/test/common/gen12lp/dg1/mock_product_helper_dg1.cpp
@@ -6,8 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
+
 constexpr static auto gfxProduct = IGFX_DG1;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen12lp/rkl/mock_product_helper_rkl.cpp b/shared/test/common/gen12lp/rkl/mock_product_helper_rkl.cpp
index e86f46fb98..10d3d63904 100644
--- a/shared/test/common/gen12lp/rkl/mock_product_helper_rkl.cpp
+++ b/shared/test/common/gen12lp/rkl/mock_product_helper_rkl.cpp
@@ -6,8 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
+
 constexpr static auto gfxProduct = IGFX_ROCKETLAKE;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen12lp/tgllp/mock_product_helper_tgllp.cpp b/shared/test/common/gen12lp/tgllp/mock_product_helper_tgllp.cpp
index 5def490e21..d42b5f6d8e 100644
--- a/shared/test/common/gen12lp/tgllp/mock_product_helper_tgllp.cpp
+++ b/shared/test/common/gen12lp/tgllp/mock_product_helper_tgllp.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
 
 constexpr static auto gfxProduct = IGFX_TIGERLAKE_LP;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen8/bdw/mock_product_helper_bdw.cpp b/shared/test/common/gen8/bdw/mock_product_helper_bdw.cpp
index d4b4fd252a..a1c4c1d8f8 100644
--- a/shared/test/common/gen8/bdw/mock_product_helper_bdw.cpp
+++ b/shared/test/common/gen8/bdw/mock_product_helper_bdw.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
 
 constexpr static auto gfxProduct = IGFX_BROADWELL;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen9/bxt/mock_product_helper_bxt.cpp b/shared/test/common/gen9/bxt/mock_product_helper_bxt.cpp
index 4c0a1d00cf..30f3a630af 100644
--- a/shared/test/common/gen9/bxt/mock_product_helper_bxt.cpp
+++ b/shared/test/common/gen9/bxt/mock_product_helper_bxt.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
 
 constexpr static auto gfxProduct = IGFX_BROXTON;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen9/cfl/mock_product_helper_cfl.cpp b/shared/test/common/gen9/cfl/mock_product_helper_cfl.cpp
index cca4a1d211..0c132f4432 100644
--- a/shared/test/common/gen9/cfl/mock_product_helper_cfl.cpp
+++ b/shared/test/common/gen9/cfl/mock_product_helper_cfl.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
 
 constexpr static auto gfxProduct = IGFX_COFFEELAKE;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen9/glk/mock_product_helper_glk.cpp b/shared/test/common/gen9/glk/mock_product_helper_glk.cpp
index 94d70d0354..d7e38b37a4 100644
--- a/shared/test/common/gen9/glk/mock_product_helper_glk.cpp
+++ b/shared/test/common/gen9/glk/mock_product_helper_glk.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
-namespace NEO {
 
 constexpr static auto gfxProduct = IGFX_GEMINILAKE;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen9/kbl/mock_product_helper_kbl.cpp b/shared/test/common/gen9/kbl/mock_product_helper_kbl.cpp
index 5d52ef8ac5..4feb4d343e 100644
--- a/shared/test/common/gen9/kbl/mock_product_helper_kbl.cpp
+++ b/shared/test/common/gen9/kbl/mock_product_helper_kbl.cpp
@@ -7,9 +7,8 @@
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
 
-namespace NEO {
-
 constexpr static auto gfxProduct = IGFX_KABYLAKE;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/gen9/skl/mock_product_helper_skl.cpp b/shared/test/common/gen9/skl/mock_product_helper_skl.cpp
index 9091ed6e8a..5916824ffc 100644
--- a/shared/test/common/gen9/skl/mock_product_helper_skl.cpp
+++ b/shared/test/common/gen9/skl/mock_product_helper_skl.cpp
@@ -7,9 +7,8 @@
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
 
-namespace NEO {
-
 constexpr static auto gfxProduct = IGFX_SKYLAKE;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/helpers/mock_product_helper_hw.cpp b/shared/test/common/helpers/mock_product_helper_hw.cpp
index fe9ec82300..7cceb7c886 100644
--- a/shared/test/common/helpers/mock_product_helper_hw.cpp
+++ b/shared/test/common/helpers/mock_product_helper_hw.cpp
@@ -7,9 +7,8 @@
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
 
-namespace NEO {
-
 constexpr static auto gfxProduct = IGFX_UNKNOWN;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/helpers/mock_product_helper_hw.inl b/shared/test/common/helpers/mock_product_helper_hw.inl
index 30a7e9dbdb..f21870031e 100644
--- a/shared/test/common/helpers/mock_product_helper_hw.inl
+++ b/shared/test/common/helpers/mock_product_helper_hw.inl
@@ -5,6 +5,8 @@
  *
  */
 
+namespace NEO {
+
 template <>
 std::vector<int32_t> MockProductHelperHw<gfxProduct>::getKernelSupportedThreadArbitrationPolicies() const {
     return threadArbPolicies;
@@ -69,3 +71,5 @@ template <>
 bool MockProductHelperHw<gfxProduct>::isUnlockingLockedPtrNecessary(const HardwareInfo &hwInfo) const {
     return this->returnedIsUnlockingLockedPtrNecessary;
 }
+
+} // namespace NEO
diff --git a/shared/test/common/xe_hpc_core/pvc/mock_product_helper_pvc.cpp b/shared/test/common/xe_hpc_core/pvc/mock_product_helper_pvc.cpp
index 50ff431c78..a5174c4982 100644
--- a/shared/test/common/xe_hpc_core/pvc/mock_product_helper_pvc.cpp
+++ b/shared/test/common/xe_hpc_core/pvc/mock_product_helper_pvc.cpp
@@ -7,9 +7,8 @@
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
 
-namespace NEO {
-
 constexpr static auto gfxProduct = IGFX_PVC;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/xe_hpg_core/dg2/mock_product_helper_dg2.cpp b/shared/test/common/xe_hpg_core/dg2/mock_product_helper_dg2.cpp
index 917de1b2db..2dac866b43 100644
--- a/shared/test/common/xe_hpg_core/dg2/mock_product_helper_dg2.cpp
+++ b/shared/test/common/xe_hpg_core/dg2/mock_product_helper_dg2.cpp
@@ -7,9 +7,8 @@
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
 
-namespace NEO {
-
 constexpr static auto gfxProduct = IGFX_DG2;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;
diff --git a/shared/test/common/xe_hpg_core/mtl/mock_product_helper_mtl.cpp b/shared/test/common/xe_hpg_core/mtl/mock_product_helper_mtl.cpp
index 47e4fab09f..8227458bbf 100644
--- a/shared/test/common/xe_hpg_core/mtl/mock_product_helper_mtl.cpp
+++ b/shared/test/common/xe_hpg_core/mtl/mock_product_helper_mtl.cpp
@@ -7,9 +7,8 @@
 
 #include "shared/test/common/helpers/mock_product_helper_hw.h"
 
-namespace NEO {
-
 constexpr static auto gfxProduct = IGFX_METEORLAKE;
+
 #include "shared/test/common/helpers/mock_product_helper_hw.inl"
-template struct MockProductHelperHw<gfxProduct>;
-} // namespace NEO
\ No newline at end of file
+
+template struct NEO::MockProductHelperHw<gfxProduct>;