diff --git a/level_zero/sysman/test/unit_tests/sources/diagnostics/linux/mock_zes_sysman_diagnostics.h b/level_zero/sysman/test/unit_tests/sources/diagnostics/linux/mock_zes_sysman_diagnostics.h
index 54017729c3..4136dbfc08 100644
--- a/level_zero/sysman/test/unit_tests/sources/diagnostics/linux/mock_zes_sysman_diagnostics.h
+++ b/level_zero/sysman/test/unit_tests/sources/diagnostics/linux/mock_zes_sysman_diagnostics.h
@@ -6,10 +6,12 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/diagnostics/linux/sysman_os_diagnostics_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 uint32_t mockDiagHandleCount = 2;
@@ -260,5 +262,7 @@ class PublicLinuxDiagnosticsImp : public L0::Sysman::LinuxDiagnosticsImp {
     using L0::Sysman::LinuxDiagnosticsImp::pSysfsAccess;
     using L0::Sysman::LinuxDiagnosticsImp::waitForQuiescentCompletion;
 };
+
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
\ No newline at end of file
diff --git a/level_zero/sysman/test/unit_tests/sources/diagnostics/linux/test_zes_sysman_diagnostics.cpp b/level_zero/sysman/test/unit_tests/sources/diagnostics/linux/test_zes_sysman_diagnostics.cpp
index ef084f5a88..4430626199 100644
--- a/level_zero/sysman/test/unit_tests/sources/diagnostics/linux/test_zes_sysman_diagnostics.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/diagnostics/linux/test_zes_sysman_diagnostics.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/diagnostics/linux/mock_zes_sysman_diagnostics.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 static int mockFileDescriptor = 123;
@@ -815,5 +816,6 @@ HWTEST2_F(ZesDiagnosticsFixture, GivenValidDiagnosticsHandleAndHandleCountZeroWh
     EXPECT_EQ(count, mockDiagHandleCount);
 }
 
-}; // namespace ult
-}; // namespace L0
+} // namespace ult
+} // namespace Sysman
+} // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/ecc/linux/mock_ecc.h b/level_zero/sysman/test/unit_tests/sources/ecc/linux/mock_ecc.h
index d1abb810d5..8e84118452 100644
--- a/level_zero/sysman/test/unit_tests/sources/ecc/linux/mock_ecc.h
+++ b/level_zero/sysman/test/unit_tests/sources/ecc/linux/mock_ecc.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
 #include "level_zero/sysman/source/ecc/sysman_ecc_imp.h"
@@ -13,6 +14,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 struct MockEccFwInterface : public L0::Sysman::FirmwareUtil {
@@ -64,4 +66,5 @@ struct MockEccFwInterface : public L0::Sysman::FirmwareUtil {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/ecc/linux/test_zes_ecc.cpp b/level_zero/sysman/test/unit_tests/sources/ecc/linux/test_zes_ecc.cpp
index db0468e00a..5eebae8e54 100644
--- a/level_zero/sysman/test/unit_tests/sources/ecc/linux/test_zes_ecc.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/ecc/linux/test_zes_ecc.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/ecc/linux/mock_ecc.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 enum eccState : uint8_t {
@@ -182,4 +183,5 @@ TEST_F(ZesEccFixture, GivenValidSysmanHandleWhenCallingEccSetStateAndEccGetState
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine.h b/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine.h
index 6b41c3ed08..4a427c09d6 100644
--- a/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine.h
+++ b/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
@@ -17,8 +18,11 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 using namespace NEO;
+
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 constexpr int64_t mockPmuFd = 10;
 constexpr uint64_t mockTimestamp = 87654321;
 constexpr uint64_t mockActiveTime = 987654321;
@@ -118,4 +122,5 @@ struct MockEngineSysfsAccess : public L0::Sysman::SysfsAccess {
 using DrmMockEngineInfoFailing = DrmMock;
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine_prelim.h b/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine_prelim.h
index b6973bab4f..88816a5ea1 100644
--- a/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine_prelim.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915_prelim.h"
 
@@ -16,8 +17,11 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 using namespace NEO;
+
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 constexpr int64_t mockPmuFd = 10;
 constexpr uint64_t mockTimestamp = 87654321;
 constexpr uint64_t mockActiveTime = 987654321;
@@ -186,5 +190,7 @@ struct MockEngineSysfsAccess : public L0::Sysman::SysfsAccess {
 
     MockEngineSysfsAccess() = default;
 };
+
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine.cpp b/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine.cpp
index b3ae7245d2..5dcb1e43f8 100644
--- a/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine.cpp
@@ -12,7 +12,9 @@
 #include "mock_engine.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 constexpr uint32_t handleComponentCount = 6u;
 class ZesEngineFixture : public SysmanDeviceFixture {
   protected:
@@ -216,4 +218,5 @@ TEST_F(ZesEngineFixture, GivenEngineInfoWithVideoQueryFailsThenFailureIsReturned
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine_prelim.cpp
index f702563c56..5eeda31bf1 100644
--- a/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine_prelim.cpp
@@ -12,7 +12,9 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 constexpr uint32_t handleComponentCount = 13u;
 constexpr uint32_t handleCountForMultiDeviceFixture = 7u;
 class ZesEngineFixture : public SysmanDeviceFixture {
@@ -386,4 +388,5 @@ TEST_F(ZesEngineMultiFixture, GivenHandleQueryItemCalledWhenPmuInterfaceOpenFail
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/engine/windows/mock_engine.h b/level_zero/sysman/test/unit_tests/sources/engine/windows/mock_engine.h
index 2a74ff9177..b0880bc0f1 100644
--- a/level_zero/sysman/test/unit_tests/sources/engine/windows/mock_engine.h
+++ b/level_zero/sysman/test/unit_tests/sources/engine/windows/mock_engine.h
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 struct MockEngineKmdSysManager : public MockKmdSysManager {
@@ -77,4 +78,5 @@ struct MockEngineKmdSysManager : public MockKmdSysManager {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/engine/windows/test_zes_engine.cpp b/level_zero/sysman/test/unit_tests/sources/engine/windows/test_zes_engine.cpp
index 1b82f086a9..b7e3ec978a 100644
--- a/level_zero/sysman/test/unit_tests/sources/engine/windows/test_zes_engine.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/engine/windows/test_zes_engine.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t engineHandleComponentCount = 3u;
@@ -130,4 +131,5 @@ TEST_F(SysmanDeviceEngineFixture, GivenValidHandleWhenGettingEngineActivityAndRe
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/events/linux/mock_events.h b/level_zero/sysman/test/unit_tests/sources/events/linux/mock_events.h
index 50291665cf..32eb657271 100644
--- a/level_zero/sysman/test/unit_tests/sources/events/linux/mock_events.h
+++ b/level_zero/sysman/test/unit_tests/sources/events/linux/mock_events.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/system_info.h"
@@ -22,7 +23,9 @@
 #include "drm/intel_hwconfig_types.h"
 
 using namespace NEO;
+
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 const std::string ueventWedgedFile("/var/lib/libze_intel_gpu/wedged_file");
@@ -304,4 +307,5 @@ class PublicLinuxEventsUtil : public L0::Sysman::LinuxEventsUtil {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/events/linux/test_zes_events.cpp b/level_zero/sysman/test/unit_tests/sources/events/linux/test_zes_events.cpp
index 2a91e9a346..93bb1cd34c 100644
--- a/level_zero/sysman/test/unit_tests/sources/events/linux/test_zes_events.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/events/linux/test_zes_events.cpp
@@ -13,6 +13,7 @@
 extern bool sysmanUltsEnable;
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t mockHandleCount = 2u;
@@ -2008,4 +2009,5 @@ TEST_F(SysmanEventsFixture, GivenValidDeviceHandleWhenListeningForUnsupportedEve
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h
index a6ee7db500..71f71e770c 100644
--- a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h
+++ b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h
@@ -16,6 +16,7 @@
 #include "gmock/gmock.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 const uint32_t mockNumPorts = 2;
@@ -77,4 +78,5 @@ class MockFabricSysFsAccess : public L0::Sysman::SysfsAccess {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_device_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_device_prelim.cpp
index 557f9b6324..5abae258c2 100644
--- a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_device_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_device_prelim.cpp
@@ -15,6 +15,7 @@
 #include <limits>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class PublicFabricDeviceAccessNl : public L0::Sysman::FabricDeviceAccessNl {
@@ -384,4 +385,5 @@ TEST_F(SysmanFabricDeviceFixture, GivenFabricDeviceAccessNlWhenGetPortsCalledWit
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_port_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_port_prelim.cpp
index 73ecc84281..7d47090d10 100644
--- a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_port_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_port_prelim.cpp
@@ -18,6 +18,7 @@
 #include <limits>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr auto maxNumPorts = 32u;
@@ -558,4 +559,5 @@ TEST_F(ZesFabricPortFixture, GivenValidFabricPortHandleWhenCallingZesFabricPortG
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_zes_fabric_port.cpp b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_zes_fabric_port.cpp
index 34b48c1c05..ff7881eae8 100644
--- a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_zes_fabric_port.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_zes_fabric_port.cpp
@@ -14,6 +14,7 @@
 #include <limits>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class ZesFabricPortFixture : public SysmanDeviceFixture {
@@ -217,4 +218,5 @@ TEST_F(ZesFabricPortFixture, GivenValidFabricPortHandleWhenCallingZesFabricPortG
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/fan/linux/test_zes_fan.cpp b/level_zero/sysman/test/unit_tests/sources/fan/linux/test_zes_fan.cpp
index 8dff1c8b8b..11044f34af 100644
--- a/level_zero/sysman/test/unit_tests/sources/fan/linux/test_zes_fan.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/fan/linux/test_zes_fan.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t fanHandleComponentCount = 0u;
@@ -107,4 +108,5 @@ TEST_F(SysmanDeviceFanFixture, GivenValidFanHandleWhenGettingFanSpeedWithPercent
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/fan/windows/mock_fan.h b/level_zero/sysman/test/unit_tests/sources/fan/windows/mock_fan.h
index 31afcc0e00..baa45641df 100644
--- a/level_zero/sysman/test/unit_tests/sources/fan/windows/mock_fan.h
+++ b/level_zero/sysman/test/unit_tests/sources/fan/windows/mock_fan.h
@@ -6,10 +6,12 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/fan/sysman_fan_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 struct MockFanKmdSysManager : public MockKmdSysManager {
@@ -100,4 +102,5 @@ struct MockFanKmdSysManager : public MockKmdSysManager {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/fan/windows/test_zes_sysman_fan.cpp b/level_zero/sysman/test/unit_tests/sources/fan/windows/test_zes_sysman_fan.cpp
index d3b2746266..f0b5133e85 100644
--- a/level_zero/sysman/test/unit_tests/sources/fan/windows/test_zes_sysman_fan.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/fan/windows/test_zes_sysman_fan.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t fanHandleComponentCount = 1u;
@@ -293,4 +294,5 @@ TEST_F(SysmanDeviceFanFixture, GivenValidFanHandleWhenGettingFanSpeedWithPercent
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware.h b/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware.h
index e3aa72db30..d17c6b1140 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware.h
+++ b/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware.h
@@ -6,10 +6,12 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t mockHandleCount = 2;
@@ -83,5 +85,7 @@ class PublicLinuxFirmwareImp : public L0::Sysman::LinuxFirmwareImp {
   public:
     using LinuxFirmwareImp::pFwInterface;
 };
+
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware_prelim.h b/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware_prelim.h
index a5b6ec3521..0d637ecb23 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware_prelim.h
@@ -6,10 +6,12 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t mockFwHandlesCount = 3;
@@ -131,5 +133,7 @@ class PublicLinuxFirmwareImp : public L0::Sysman::LinuxFirmwareImp {
   public:
     using LinuxFirmwareImp::pFwInterface;
 };
+
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware/linux/test_zes_sysman_firmware.cpp b/level_zero/sysman/test/unit_tests/sources/firmware/linux/test_zes_sysman_firmware.cpp
index bfdd0b768d..92ea609e46 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware/linux/test_zes_sysman_firmware.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/firmware/linux/test_zes_sysman_firmware.cpp
@@ -8,6 +8,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class ZesFirmwareFixture : public SysmanDeviceFixture {
@@ -255,4 +256,5 @@ class ZesFirmwareUninitializedFixture : public SysmanDeviceFixture {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware/linux/test_zes_sysman_firmware_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/firmware/linux/test_zes_sysman_firmware_prelim.cpp
index 39e79c8e51..52a1c00a11 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware/linux/test_zes_sysman_firmware_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/firmware/linux/test_zes_sysman_firmware_prelim.cpp
@@ -8,6 +8,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware_prelim.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class ZesSysmanFirmwareFixture : public SysmanDeviceFixture {
@@ -304,4 +305,5 @@ class ZesFirmwareUninitializedFixture : public SysmanDeviceFixture {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h b/level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h
index 54a04ff956..e93fbd4f27 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h
+++ b/level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h
@@ -17,6 +17,7 @@
 using namespace NEO;
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 struct MockFwUtilInterface : public L0::Sysman::FirmwareUtil {
@@ -71,4 +72,5 @@ struct MockFwUtilOsLibrary : public OsLibrary {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util.cpp b/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util.cpp
index d21edff583..3c20abebbb 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util.cpp
@@ -12,6 +12,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 static uint32_t mockFwUtilDeviceCloseCallCount = 0;
@@ -49,24 +50,25 @@ TEST(FwUtilDeleteTest, GivenLibraryWasSetWhenFirmwareUtilInterfaceIsDeletedThenL
 }
 
 TEST(FwUtilTest, GivenLibraryWasSetWhenCreatingFirmwareUtilInterfaceAndGetProcAddressFailsThenFirmwareUtilInterfaceIsNotCreated) {
-    L0::Sysman::FirmwareUtilImp::osLibraryLoadFunction = L0::ult::MockFwUtilOsLibrary::load;
+    L0::Sysman::FirmwareUtilImp::osLibraryLoadFunction = L0::Sysman::ult::MockFwUtilOsLibrary::load;
     L0::Sysman::FirmwareUtil *pFwUtil = L0::Sysman::FirmwareUtil::create(0, 0, 0, 0);
     EXPECT_EQ(pFwUtil, nullptr);
 }
 
 TEST(FwUtilTest, GivenLibraryWasSetWhenCreatingFirmwareUtilInterfaceAndIgscDeviceIterCreateFailsThenFirmwareUtilInterfaceIsNotCreated) {
 
-    L0::Sysman::FirmwareUtilImp::osLibraryLoadFunction = L0::ult::MockFwUtilOsLibrary::load;
+    L0::Sysman::FirmwareUtilImp::osLibraryLoadFunction = L0::Sysman::ult::MockFwUtilOsLibrary::load;
     L0::Sysman::FirmwareUtil *pFwUtil = L0::Sysman::FirmwareUtil::create(0, 0, 0, 0);
     EXPECT_EQ(pFwUtil, nullptr);
 }
 
 TEST(FwUtilTest, GivenLibraryWasNotSetWhenCreatingFirmwareUtilInterfaceThenFirmwareUtilInterfaceIsNotCreated) {
-    L0::ult::MockFwUtilOsLibrary::mockLoad = false;
-    L0::Sysman::FirmwareUtilImp::osLibraryLoadFunction = L0::ult::MockFwUtilOsLibrary::load;
+    L0::Sysman::ult::MockFwUtilOsLibrary::mockLoad = false;
+    L0::Sysman::FirmwareUtilImp::osLibraryLoadFunction = L0::Sysman::ult::MockFwUtilOsLibrary::load;
     L0::Sysman::FirmwareUtil *pFwUtil = L0::Sysman::FirmwareUtil::create(0, 0, 0, 0);
     EXPECT_EQ(pFwUtil, nullptr);
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util_helper.cpp b/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util_helper.cpp
index 65c425ab93..2f1bc0897b 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util_helper.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util_helper.cpp
@@ -17,6 +17,8 @@ extern L0::Sysman::pIgscIfrGetStatusExt L0::Sysman::deviceIfrGetStatusExt;
 extern L0::Sysman::pIgscIfrRunMemPPRTest L0::Sysman::deviceIfrRunMemPPRTest;
 extern L0::Sysman::pIgscGetEccConfig getEccConfig;
 extern L0::Sysman::pIgscSetEccConfig setEccConfig;
+
+namespace Sysman {
 namespace ult {
 
 constexpr static uint32_t mockMaxTileCount = 2;
@@ -424,4 +426,5 @@ TEST(FwGetMemHealthIndicatorTest, GivenFwGetHealthIndicatorProcAddrIsNullWhenMem
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency.h b/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency.h
index f2a16ba105..b41d31c4ce 100644
--- a/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency.h
+++ b/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
 #include "level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp.h"
@@ -13,6 +14,7 @@
 #include "gtest/gtest.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 const std::string minFreqFile("gt/gt0/rps_min_freq_mhz");
@@ -338,4 +340,5 @@ class PublicLinuxFrequencyImp : public L0::Sysman::LinuxFrequencyImp {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency_prelim.h b/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency_prelim.h
index 4233350874..23802c691a 100644
--- a/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency_prelim.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
 #include "level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp_prelim.h"
@@ -14,6 +15,7 @@
 #include "igfxfmid.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 const std::string minFreqFile("gt/gt0/rps_min_freq_mhz");
@@ -354,4 +356,5 @@ class PublicLinuxFrequencyImp : public L0::Sysman::LinuxFrequencyImp {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/frequency/linux/test_zes_frequency.cpp b/level_zero/sysman/test/unit_tests/sources/frequency/linux/test_zes_frequency.cpp
index ad531fbfe0..3410ed31f7 100644
--- a/level_zero/sysman/test/unit_tests/sources/frequency/linux/test_zes_frequency.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/frequency/linux/test_zes_frequency.cpp
@@ -11,6 +11,7 @@
 #include <cmath>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr double minFreq = 300.0;
@@ -917,4 +918,5 @@ TEST_F(FreqMultiDeviceFixture, GivenValidFrequencyHandleWhenCallingzesFrequencyG
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/frequency/linux/test_zes_frequency_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/frequency/linux/test_zes_frequency_prelim.cpp
index 80faed15f2..8a2086c746 100644
--- a/level_zero/sysman/test/unit_tests/sources/frequency/linux/test_zes_frequency_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/frequency/linux/test_zes_frequency_prelim.cpp
@@ -11,6 +11,7 @@
 #include <cmath>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr double minFreq = 300.0;
@@ -856,4 +857,5 @@ TEST_F(FreqMultiDeviceFixture, GivenValidFrequencyHandleWhenCallingzesFrequencyG
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/frequency/windows/mock_frequency.h b/level_zero/sysman/test/unit_tests/sources/frequency/windows/mock_frequency.h
index 99c717693b..9d5b9c89bf 100644
--- a/level_zero/sysman/test/unit_tests/sources/frequency/windows/mock_frequency.h
+++ b/level_zero/sysman/test/unit_tests/sources/frequency/windows/mock_frequency.h
@@ -11,6 +11,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 struct MockFrequencyKmdSysManager : public MockKmdSysManager {
@@ -412,4 +413,5 @@ struct MockFrequencyKmdSysManager : public MockKmdSysManager {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/frequency/windows/test_zes_frequency.cpp b/level_zero/sysman/test/unit_tests/sources/frequency/windows/test_zes_frequency.cpp
index c3e5a3dae3..f63b3adb26 100644
--- a/level_zero/sysman/test/unit_tests/sources/frequency/windows/test_zes_frequency.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/frequency/windows/test_zes_frequency.cpp
@@ -11,6 +11,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t frequencyHandleComponentCount = 3u;
@@ -575,4 +576,5 @@ TEST_F(SysmanDeviceFrequencyFixture, GivenValidFrequencyHandleAllowSetCallsToTru
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/global_operations/linux/mock_global_operations.h b/level_zero/sysman/test/unit_tests/sources/global_operations/linux/mock_global_operations.h
index 37244ce38e..803b95269e 100644
--- a/level_zero/sysman/test/unit_tests/sources/global_operations/linux/mock_global_operations.h
+++ b/level_zero/sysman/test/unit_tests/sources/global_operations/linux/mock_global_operations.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/test_macros/mock_method_macros.h"
@@ -17,6 +18,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 const std::string vendorIntel("Intel(R) Corporation");
@@ -576,4 +578,5 @@ class PublicLinuxGlobalOperationsImp : public L0::Sysman::LinuxGlobalOperationsI
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/global_operations/linux/test_zes_global_operations.cpp b/level_zero/sysman/test/unit_tests/sources/global_operations/linux/test_zes_global_operations.cpp
index 790a0e2ee9..18f3841d5e 100644
--- a/level_zero/sysman/test/unit_tests/sources/global_operations/linux/test_zes_global_operations.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/global_operations/linux/test_zes_global_operations.cpp
@@ -16,6 +16,7 @@
 #include <sys/stat.h>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint64_t memSize1 = 2048;
@@ -940,4 +941,5 @@ TEST_F(SysmanDeviceFixture, GivenValidDeviceHandleWhenCallingDeviceGetStateThenS
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/global_operations/linux/test_zes_global_operations_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/global_operations/linux/test_zes_global_operations_prelim.cpp
index ed625041af..6a90f7c458 100644
--- a/level_zero/sysman/test/unit_tests/sources/global_operations/linux/test_zes_global_operations_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/global_operations/linux/test_zes_global_operations_prelim.cpp
@@ -9,6 +9,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class SysmanGlobalOperationsHelperFixture : public SysmanDeviceFixture {
@@ -112,4 +113,5 @@ TEST_F(SysmanGlobalOperationsHelperFixture, GivenDeviceIsRepairedWhenCallingGetD
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/global_operations/windows/mock_global_operations.h b/level_zero/sysman/test/unit_tests/sources/global_operations/windows/mock_global_operations.h
index 0da38f98c9..fca149188c 100644
--- a/level_zero/sysman/test/unit_tests/sources/global_operations/windows/mock_global_operations.h
+++ b/level_zero/sysman/test/unit_tests/sources/global_operations/windows/mock_global_operations.h
@@ -6,11 +6,13 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/global_operations/sysman_global_operations_imp.h"
 #include "level_zero/sysman/source/global_operations/windows/sysman_os_global_operations_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 struct MockGlobalOpsKmdSysManager : public MockKmdSysManager {
@@ -34,4 +36,5 @@ struct MockGlobalOpsKmdSysManager : public MockKmdSysManager {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/global_operations/windows/test_zes_global_operations.cpp b/level_zero/sysman/test/unit_tests/sources/global_operations/windows/test_zes_global_operations.cpp
index c9d9a297d4..bfbc2d9304 100644
--- a/level_zero/sysman/test/unit_tests/sources/global_operations/windows/test_zes_global_operations.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/global_operations/windows/test_zes_global_operations.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class SysmanGlobalOperationsFixture : public SysmanDeviceFixture {
@@ -74,4 +75,5 @@ TEST_F(SysmanGlobalOperationsFixture, GivenProcessStartsMidResetWhenCallingReset
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_driver.h b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_driver.h
index 6da7c00b20..c438244883 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_driver.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_driver.h
@@ -6,11 +6,12 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/sysman_driver_imp.h"
 
 namespace L0 {
-namespace ult {
 namespace Sysman {
+namespace ult {
 
 struct MockSysmanDriver : public ::L0::Sysman::SysmanDriverImp {
     MockSysmanDriver() {
@@ -30,6 +31,6 @@ struct MockSysmanDriver : public ::L0::Sysman::SysmanDriverImp {
     uint32_t initCalledCount = 0;
 };
 
-} // namespace Sysman
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_drm.h b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_drm.h
index 1de6c47627..404da685f2 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_drm.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_drm.h
@@ -15,7 +15,9 @@
 #include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 constexpr int mockFd = -1;
 class SysmanMockDrm : public NEO::Drm {
   public:
@@ -25,4 +27,5 @@ class SysmanMockDrm : public NEO::Drm {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h
index e782a32cfa..07fb3ba8ab 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h
@@ -28,7 +28,9 @@
 using namespace NEO;
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 class PublicLinuxSysmanImp : public L0::Sysman::LinuxSysmanImp {
   public:
     using LinuxSysmanImp::mapOfSubDeviceIdToPmtObject;
@@ -155,4 +157,5 @@ class PublicLinuxSysmanDriverImp : public L0::Sysman::LinuxSysmanDriverImp {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h
index 15e9698d82..33e52ad2c2 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h
@@ -5,12 +5,14 @@
  *
  */
 
-#include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h"
-
 #pragma once
 
+#include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h"
+
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 class MockSysmanHwDeviceIdDrm : public L0::Sysman::SysmanHwDeviceIdDrm {
   public:
     using L0::Sysman::SysmanHwDeviceIdDrm::SysmanHwDeviceIdDrm;
@@ -27,4 +29,5 @@ class MockSysmanHwDeviceIdDrm : public L0::Sysman::SysmanHwDeviceIdDrm {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp
index 1a84ff0954..d197fb9615 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 ze_result_t MockIafNlApi::fPortStatusQuery(const L0::Sysman::IafPortId portId, L0::Sysman::IafPortState &state) {
@@ -274,4 +275,5 @@ ze_result_t MockIafNlApi::fportProperties(const L0::Sysman::IafPortId portId, ui
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
\ No newline at end of file
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h
index a19b18dd0c..ef22768f33 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h
@@ -14,6 +14,7 @@
 #include <sstream>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class MockIafNlApi : public L0::Sysman::IafNlApi {
@@ -113,4 +114,5 @@ class MockIafNlApi : public L0::Sysman::IafNlApi {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp
index 06b3801151..ba60648230 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 void MockNlApi::validateId(bool checkFabricId, bool checkAttachId, bool checkPortNumber) {
@@ -495,4 +496,5 @@ int MockNlApi::genlUnregisterFamily(struct genl_ops *ops) {
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h
index 7442b69219..60b4e45e32 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h
@@ -17,6 +17,7 @@
 #include <map>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class MyNlattr {
@@ -159,4 +160,5 @@ class MockNlApi : public L0::Sysman::NlApi {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.cpp
index 441a294bd3..0a58b4f5a4 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.cpp
@@ -10,6 +10,7 @@
 #include <level_zero/zes_api.h>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 extern "C" {
@@ -260,4 +261,5 @@ void MockNlDll::deleteEntryPoint(const std::string &procName) {
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h
index a8d989f4c1..28f5fcc84e 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/os_interface/os_library.h"
 
 #include "level_zero/sysman/source/linux/nl_api/sysman_nl_api.h"
@@ -13,13 +14,12 @@
 #include "gmock/gmock.h"
 
 // Define opaque types so variables can be allocated
-struct nl_sock {
-};
+struct nl_sock {};
 
-struct nl_msg {
-};
+struct nl_msg {};
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class MockNlDll : public NEO::OsLibrary {
@@ -65,4 +65,5 @@ class MockNlDll : public NEO::OsLibrary {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
index ee126bcfe8..ec637df391 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
@@ -16,14 +16,14 @@
 #include <limits>
 #include <netlink/handlers.h>
 
-struct nl_sock {
-};
+struct nl_sock {};
 
 namespace NEO {
 extern std::map<std::string, std::vector<std::string>> directoryFilesMap;
 }
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class PublicIafNlApi : public L0::Sysman::IafNlApi {
@@ -957,4 +957,5 @@ TEST_F(SysmanIafNlApiFixture, GivenIafNlApiWhenGetPortsIsCalledAndFportPropertie
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_nl_api.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_nl_api.cpp
index dabf953e66..5ff16fea96 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_nl_api.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_nl_api.cpp
@@ -8,6 +8,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class PublicNlApi : public L0::Sysman::NlApi {
@@ -206,5 +207,7 @@ TEST_F(SysmanNlApiFixture, GivenNlApiWhenCompleteMockNlDllThenVerifyNlmsgAttrlen
 TEST_F(SysmanNlApiFixture, GivenNlApiWhenCompleteMockNlDllThenVerifyNlmsgHdrReturnsNlmsghdr) {
     EXPECT_EQ(&MockNlDll::mockNlmsghdr, testNlApi.nlmsgHdr(&MockNlDll::mockNlMsg));
 }
+
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/pmt/mock_pmt.h b/level_zero/sysman/test/unit_tests/sources/linux/pmt/mock_pmt.h
index 350390d2d3..5d907d57c4 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/pmt/mock_pmt.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/pmt/mock_pmt.h
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 const std::string baseTelemSysFS("/sys/class/intel_pmt");
@@ -156,4 +157,5 @@ class PublicPlatformMonitoringTech : public L0::Sysman::PlatformMonitoringTech {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/pmt/test_pmt.cpp b/level_zero/sysman/test/unit_tests/sources/linux/pmt/test_pmt.cpp
index dda8674384..8f429b04ba 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/pmt/test_pmt.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/pmt/test_pmt.cpp
@@ -10,7 +10,9 @@
 #include "mock_pmt.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 static int fakeFileDescriptor = 123;
 
 const std::map<std::string, uint64_t> dummyKeyOffsetMap = {
@@ -273,4 +275,5 @@ class ZesPmtFixtureNoSubDevice : public SysmanDeviceFixture {
 TEST_F(ZesPmtFixtureNoSubDevice, GivenValidDeviceHandlesWhenCreatingPMTHandlesThenValidPmtHandlesForAllSubdevicesWillBeCreated) {}
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/pmu/mock_pmu.h b/level_zero/sysman/test/unit_tests/sources/linux/pmu/mock_pmu.h
index 7c765fa683..159cde42f6 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/pmu/mock_pmu.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/pmu/mock_pmu.h
@@ -10,8 +10,11 @@
 #include "level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h"
 
 using namespace NEO;
+
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 constexpr uint64_t mockEventVal = 2u;
 constexpr uint64_t mockTimeStamp = 100u;
 constexpr int64_t mockPmuFd = 5;
@@ -50,4 +53,5 @@ struct MockPmuFsAccess : public L0::Sysman::FsAccess {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
\ No newline at end of file
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/pmu/test_pmu.cpp b/level_zero/sysman/test/unit_tests/sources/linux/pmu/test_pmu.cpp
index dfb6d50485..9223309296 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/pmu/test_pmu.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/pmu/test_pmu.cpp
@@ -11,7 +11,9 @@
 #include <cmath>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 struct SysmanPmuFixture : public SysmanDeviceFixture {
   protected:
     std::unique_ptr<MockPmuInterface> pPmuInterface;
@@ -128,4 +130,5 @@ TEST_F(SysmanPmuFixture, GivenValidPmuHandleWhenAndDomainErrorOccursThenDomainEr
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/test_sysman.cpp b/level_zero/sysman/test/unit_tests/sources/linux/test_sysman.cpp
index fdacd37de9..7aac2c79cf 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/test_sysman.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/test_sysman.cpp
@@ -15,7 +15,9 @@ namespace SysCalls {
 extern bool allowFakeDevicePath;
 } // namespace SysCalls
 } // namespace NEO
+
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 inline static int mockAccessFailure(const char *pathname, int mode) {
@@ -224,4 +226,5 @@ TEST(SysmanUnknownDriverModelTest, GivenDriverModelTypeIsNotDrmWhenExecutingSysm
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_driver.cpp b/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_driver.cpp
index c84cbccab3..abb176762b 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_driver.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_driver.cpp
@@ -24,8 +24,8 @@
 #include <cstring>
 
 namespace L0 {
-namespace ult {
 namespace Sysman {
+namespace ult {
 
 TEST(zesInit, whenCallingZesInitThenInitializeOnDriverIsCalled) {
     MockSysmanDriver driver;
@@ -294,6 +294,6 @@ TEST_F(SysmanDriverHandleTest, whenQueryingForDevicesWithCountGreaterThanZeroAnd
     EXPECT_EQ(ZE_RESULT_ERROR_INVALID_NULL_HANDLE, result);
 }
 
-} // namespace Sysman
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_hw_device_id.cpp b/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_hw_device_id.cpp
index 476758afba..9ddbe7811e 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_hw_device_id.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_hw_device_id.cpp
@@ -16,6 +16,7 @@
 #include <cstring>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 TEST(sysmanHwDeviceIdTest, whenOpenFileDescriptorIsCalledMultipleTimesThenOpenIsCalledOnlyOnce) {
@@ -55,4 +56,5 @@ TEST(sysmanHwDeviceIdTest, whenOpenFileDescriptorIsCalledMultipleTimesThenCloseI
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h b/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h
index 85c65a96a7..bf6b311233 100644
--- a/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h
+++ b/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/memory_info.h"
 
@@ -15,6 +16,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 using namespace NEO;
+
 constexpr uint64_t probedSizeRegionZero = 8 * GB;
 constexpr uint64_t probedSizeRegionOne = 16 * GB;
 constexpr uint64_t probedSizeRegionTwo = 4 * GB;
@@ -23,7 +25,9 @@ constexpr uint64_t unallocatedSizeRegionZero = 6 * GB;
 constexpr uint64_t unallocatedSizeRegionOne = 12 * GB;
 constexpr uint64_t unallocatedSizeRegionTwo = 25 * GB;
 constexpr uint64_t unallocatedSizeRegionThree = 3 * GB;
+
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 struct MockMemoryNeoDrm : public Drm {
@@ -51,4 +55,5 @@ struct MockMemoryNeoDrm : public Drm {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory_prelim.h b/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory_prelim.h
index 98de2fd5fc..f21522cfce 100644
--- a/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory_prelim.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/source/os_interface/linux/system_info.h"
@@ -73,7 +74,9 @@ constexpr uint64_t numberMcChannels = 16;
 constexpr uint64_t transactionSize = 32;
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 uint32_t mockMemoryType = INTEL_HWCONFIG_MEMORY_TYPE_HBM2e;
 std::string mockPhysicalSize = "0x00000040000000";
 uint64_t hbmRP0Frequency = 4200; // in MHz
@@ -455,4 +458,5 @@ class PublicLinuxMemoryImp : public L0::Sysman::LinuxMemoryImp {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory.cpp b/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory.cpp
index a981dac960..0facbb00fa 100644
--- a/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory.cpp
@@ -12,6 +12,7 @@
 #include "gtest/gtest.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t memoryHandleComponentCount = 1u;
@@ -137,4 +138,5 @@ TEST_F(SysmanMultiDeviceFixture, GivenValidDevicePointerWhenGettingMemoryPropert
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_dg1.cpp b/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_dg1.cpp
index d54b6f1ddd..5c9c35be50 100644
--- a/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_dg1.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_dg1.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t memoryHandleComponentCount = 1u;
@@ -204,4 +205,5 @@ TEST_F(SysmanMultiDeviceFixture, GivenValidDevicePointerWhenGettingMemoryPropert
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
\ No newline at end of file
diff --git a/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_prelim.cpp
index 8e50e29d95..b4feee4940 100644
--- a/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_prelim.cpp
@@ -16,6 +16,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory_prelim.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr int32_t memoryBusWidth = 128; // bus width in bits
@@ -824,4 +825,5 @@ TEST_F(SysmanMultiDeviceMemoryFixture, GivenValidMemoryHandleWhenCallingZetSysma
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
\ No newline at end of file
diff --git a/level_zero/sysman/test/unit_tests/sources/memory/windows/mock_memory.h b/level_zero/sysman/test/unit_tests/sources/memory/windows/mock_memory.h
index 125b63802b..7f2fe75cc3 100644
--- a/level_zero/sysman/test/unit_tests/sources/memory/windows/mock_memory.h
+++ b/level_zero/sysman/test/unit_tests/sources/memory/windows/mock_memory.h
@@ -13,6 +13,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 struct MockMemoryManagerSysman : public MemoryManagerMock {
@@ -147,4 +148,5 @@ class PublicWddmPowerImp : public L0::Sysman::WddmMemoryImp {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/memory/windows/mock_memory_manager.h b/level_zero/sysman/test/unit_tests/sources/memory/windows/mock_memory_manager.h
index 74261cd070..7c4aca0e55 100644
--- a/level_zero/sysman/test/unit_tests/sources/memory/windows/mock_memory_manager.h
+++ b/level_zero/sysman/test/unit_tests/sources/memory/windows/mock_memory_manager.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/memory_manager/os_agnostic_memory_manager.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 
@@ -17,6 +18,7 @@
 #endif
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 template <typename Type>
@@ -49,6 +51,7 @@ struct WhiteBox<::NEO::OsAgnosticMemoryManager> : public ::NEO::OsAgnosticMemory
 using MemoryManagerMock = WhiteBox<::NEO::OsAgnosticMemoryManager>;
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
 
 #if defined(__clang__)
diff --git a/level_zero/sysman/test/unit_tests/sources/memory/windows/test_zes_memory.cpp b/level_zero/sysman/test/unit_tests/sources/memory/windows/test_zes_memory.cpp
index d41ad10164..d99140df36 100644
--- a/level_zero/sysman/test/unit_tests/sources/memory/windows/test_zes_memory.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/memory/windows/test_zes_memory.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t memoryHandleComponentCount = 1u;
@@ -166,4 +167,5 @@ TEST_F(SysmanDeviceMemoryFixture, DISABLED_GivenValidMemoryHandleWhenGettingBand
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/pci/linux/mock_sysfs_pci.h b/level_zero/sysman/test/unit_tests/sources/pci/linux/mock_sysfs_pci.h
index 03f6d990a4..7654e6c32c 100644
--- a/level_zero/sysman/test/unit_tests/sources/pci/linux/mock_sysfs_pci.h
+++ b/level_zero/sysman/test/unit_tests/sources/pci/linux/mock_sysfs_pci.h
@@ -6,12 +6,14 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/linux/sysman_fs_access.h"
 #include "level_zero/sysman/source/pci/linux/sysman_os_pci_imp.h"
 #include "level_zero/sysman/source/pci/sysman_pci_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 const std::string deviceDir("device");
@@ -105,4 +107,5 @@ class PublicLinuxPciImp : public L0::Sysman::LinuxPciImp {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/pci/linux/test_zes_pci.cpp b/level_zero/sysman/test/unit_tests/sources/pci/linux/test_zes_pci.cpp
index 870352ac1b..9e313b65cb 100644
--- a/level_zero/sysman/test/unit_tests/sources/pci/linux/test_zes_pci.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/pci/linux/test_zes_pci.cpp
@@ -11,7 +11,9 @@
 #include <string>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 constexpr uint32_t expectedBus = 0u;
 constexpr uint32_t expectedDevice = 2u;
 constexpr uint32_t expectedFunction = 0u;
@@ -219,7 +221,7 @@ class ZesPciFixture : public SysmanDeviceFixture {
     L0::Sysman::FsAccess *pOriginalFsAccess = nullptr;
     L0::Sysman::PciImp *pPciImp;
     L0::Sysman::OsPci *pOsPciPrev;
-    std::unique_ptr<Mock<L0::DriverHandleImp>> driverHandle;
+    std::unique_ptr<L0::ult::Mock<L0::DriverHandleImp>> driverHandle;
 
     void SetUp() override {
         SysmanDeviceFixture::SetUp();
@@ -651,4 +653,5 @@ TEST_F(ZesPciFixture, WhenConvertingLinkSpeedFromGigatransfersPerSecondToBytesPe
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/performance/linux/CMakeLists.txt b/level_zero/sysman/test/unit_tests/sources/performance/linux/CMakeLists.txt
index 707f8d313a..460fca479b 100644
--- a/level_zero/sysman/test/unit_tests/sources/performance/linux/CMakeLists.txt
+++ b/level_zero/sysman/test/unit_tests/sources/performance/linux/CMakeLists.txt
@@ -16,7 +16,6 @@ if(NEO_ENABLE_i915_PRELIM_DETECTION)
 else()
   list(APPEND L0_TESTS_SYSMAN_PERFORMANCE_LINUX
        ${CMAKE_CURRENT_SOURCE_DIR}/test_zes_performance.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/mock_sysfs_performance.h
   )
 endif()
 
diff --git a/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance.h b/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance.h
deleted file mode 100644
index 12e595a569..0000000000
--- a/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2023 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#pragma once
-#include "level_zero/sysman/source/linux/sysman_fs_access.h"
-#include "level_zero/sysman/source/performance/linux/sysman_os_performance_imp.h"
-#include "level_zero/sysman/source/performance/sysman_performance.h"
-#include "level_zero/sysman/source/performance/sysman_performance_imp.h"
-
-namespace L0 {
-namespace ult {
-} // namespace ult
-} // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance_prelim.h b/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance_prelim.h
index 9cc2129bad..86145f2f5c 100644
--- a/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance_prelim.h
@@ -6,12 +6,14 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/linux/sysman_fs_access.h"
 #include "level_zero/sysman/source/performance/linux/sysman_os_performance_imp_prelim.h"
 #include "level_zero/sysman/source/performance/sysman_performance.h"
 #include "level_zero/sysman/source/performance/sysman_performance_imp.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 const std::string mediaFreqFactorSubDevice0("gt/gt0/media_freq_factor");
@@ -160,4 +162,5 @@ class PublicLinuxPerformanceImp : public L0::Sysman::LinuxPerformanceImp {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/performance/linux/test_zes_performance.cpp b/level_zero/sysman/test/unit_tests/sources/performance/linux/test_zes_performance.cpp
index 9b7f372194..d678289154 100644
--- a/level_zero/sysman/test/unit_tests/sources/performance/linux/test_zes_performance.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/performance/linux/test_zes_performance.cpp
@@ -5,10 +5,13 @@
  *
  */
 
+#include "level_zero/sysman/source/performance/linux/sysman_os_performance_imp.h"
+#include "level_zero/sysman/source/performance/sysman_performance.h"
+#include "level_zero/sysman/source/performance/sysman_performance_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
-#include "level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t mockHandleCount = 5;
@@ -74,4 +77,5 @@ TEST_F(ZesPerformanceFixture, GivenValidOsSysmanPointerWhenCreatingOsPerformance
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
\ No newline at end of file
diff --git a/level_zero/sysman/test/unit_tests/sources/performance/linux/test_zes_performance_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/performance/linux/test_zes_performance_prelim.cpp
index 332a4f439a..41bc4f0325 100644
--- a/level_zero/sysman/test/unit_tests/sources/performance/linux/test_zes_performance_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/performance/linux/test_zes_performance_prelim.cpp
@@ -9,6 +9,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance_prelim.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t mockHandleCount = 5;
@@ -315,4 +316,5 @@ TEST_F(ZesPerformanceFixture, GivenValidOfjectsOfClassPerformanceImpAndPerforman
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/performance/windows/mock_performance.h b/level_zero/sysman/test/unit_tests/sources/performance/windows/mock_performance.h
index b27cbf191a..bf0b4d84f2 100644
--- a/level_zero/sysman/test/unit_tests/sources/performance/windows/mock_performance.h
+++ b/level_zero/sysman/test/unit_tests/sources/performance/windows/mock_performance.h
@@ -6,10 +6,12 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/performance/windows/sysman_os_performance_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 struct PerformanceKmdSysManager : public MockKmdSysManager {
@@ -85,4 +87,5 @@ class PublicWddmPerformanceImp : public L0::Sysman::WddmPerformanceImp {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/performance/windows/test_zes_performance.cpp b/level_zero/sysman/test/unit_tests/sources/performance/windows/test_zes_performance.cpp
index f01284b7a4..ed6248e8f3 100644
--- a/level_zero/sysman/test/unit_tests/sources/performance/windows/test_zes_performance.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/performance/windows/test_zes_performance.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t mockHandleCount = 1u;
@@ -164,4 +165,5 @@ TEST_F(SysmanDevicePerformanceFixture, GivenValidPerfHandleWhenSettingPerformanc
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
\ No newline at end of file
diff --git a/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h b/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h
index 0ba54cb367..0c5e80df58 100644
--- a/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h
+++ b/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/helpers/string.h"
 
 #include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
@@ -16,7 +17,9 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 constexpr uint64_t setEnergyCounter = (83456u * 1048576u);
 constexpr uint64_t offset = 0x400;
 const std::string deviceName("device");
@@ -452,4 +455,5 @@ class SysmanDevicePowerMultiDeviceFixture : public SysmanMultiDeviceFixture {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h b/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h
index d99ed85b3a..3f90da774c 100644
--- a/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/helpers/string.h"
 
 #include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
@@ -16,7 +17,9 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 constexpr uint64_t setEnergyCounter = (83456u * 1048576u);
 constexpr uint64_t offset = 0x400;
 constexpr uint32_t mockLimitCount = 2u;
@@ -381,4 +384,5 @@ class SysmanDevicePowerMultiDeviceFixture : public SysmanMultiDeviceFixture {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power.cpp b/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power.cpp
index 95c4071550..361ed70c9c 100644
--- a/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power.cpp
@@ -8,6 +8,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 static int fakeFileDescriptor = 123;
@@ -711,4 +712,5 @@ TEST_F(SysmanDevicePowerFixture, GivenValidPowerHandleWhenGettingPowerProperties
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power_helper.cpp b/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power_helper.cpp
index 0c77a46cd8..74d3e33414 100644
--- a/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power_helper.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power_helper.cpp
@@ -8,6 +8,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t powerHandleComponentCount = 1u;
@@ -63,4 +64,5 @@ TEST_F(SysmanDevicePowerMultiDeviceFixtureHelper, GivenScanDirectoriesFailAndPmt
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power_helper_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power_helper_prelim.cpp
index 29fc216a7e..1bcb7a4b38 100644
--- a/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power_helper_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power_helper_prelim.cpp
@@ -8,6 +8,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t powerHandleComponentCountMultiDevice = 3u;
@@ -357,4 +358,5 @@ HWTEST2_F(SysmanDevicePowerMultiDeviceFixtureHelper, GivenValidPowerHandlesWhenC
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
\ No newline at end of file
diff --git a/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power_prelim.cpp
index 1da334b0b3..74270c25f5 100644
--- a/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/power/linux/test_zes_power_prelim.cpp
@@ -8,6 +8,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 static int fakeFileDescriptor = 123;
@@ -791,4 +792,5 @@ TEST_F(SysmanDevicePowerMultiDeviceFixture, GivenValidPowerHandleWhenGettingPowe
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/power/windows/mock_power.h b/level_zero/sysman/test/unit_tests/sources/power/windows/mock_power.h
index e48ead34d5..99b87128fd 100644
--- a/level_zero/sysman/test/unit_tests/sources/power/windows/mock_power.h
+++ b/level_zero/sysman/test/unit_tests/sources/power/windows/mock_power.h
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 struct PowerKmdSysManager : public MockKmdSysManager {
@@ -205,4 +206,5 @@ struct PowerKmdSysManager : public MockKmdSysManager {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/power/windows/test_zes_sysman_power.cpp b/level_zero/sysman/test/unit_tests/sources/power/windows/test_zes_sysman_power.cpp
index 9291729f91..053d949179 100644
--- a/level_zero/sysman/test/unit_tests/sources/power/windows/test_zes_sysman_power.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/power/windows/test_zes_sysman_power.cpp
@@ -9,6 +9,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t powerHandleComponentCount = 1u;
@@ -286,4 +287,5 @@ TEST_F(SysmanDevicePowerFixture, GivenValidPowerHandlesWhenCallingSetAndGetPower
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras.h b/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras.h
index 95755295ff..ea295735a5 100644
--- a/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras.h
+++ b/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras.h
@@ -6,12 +6,14 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/linux/sysman_fs_access.h"
 #include "level_zero/sysman/source/ras/linux/sysman_os_ras_imp.h"
 #include "level_zero/sysman/source/ras/sysman_ras.h"
 #include "level_zero/sysman/source/ras/sysman_ras_imp.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class MockRasFsAccess : public L0::Sysman::FsAccess {
@@ -24,4 +26,5 @@ class MockRasFsAccess : public L0::Sysman::FsAccess {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras_prelim.h b/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras_prelim.h
index 500416a126..4f39cc723e 100644
--- a/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras_prelim.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/system_info.h"
 
@@ -20,7 +21,9 @@
 #include "drm/intel_hwconfig_types.h"
 
 using namespace NEO;
+
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 const std::string deviceDir("device");
@@ -688,4 +691,5 @@ class PublicLinuxRasImp : public L0::Sysman::LinuxRasImp {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/ras/linux/test_zes_ras.cpp b/level_zero/sysman/test/unit_tests/sources/ras/linux/test_zes_ras.cpp
index ee4cdd16ba..084ac4c790 100644
--- a/level_zero/sysman/test/unit_tests/sources/ras/linux/test_zes_ras.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/ras/linux/test_zes_ras.cpp
@@ -11,6 +11,7 @@
 #include "mock_fs_ras.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t mockHandleCount = 0;
@@ -169,4 +170,5 @@ TEST_F(SysmanRasFixture, GivenValidInstanceWhenOsRasImplementationIsNullThenDest
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/ras/linux/test_zes_ras_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/ras/linux/test_zes_ras_prelim.cpp
index e41dff2e6a..5d364800ba 100644
--- a/level_zero/sysman/test/unit_tests/sources/ras/linux/test_zes_ras_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/ras/linux/test_zes_ras_prelim.cpp
@@ -12,8 +12,11 @@
 #include "level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras_prelim.h"
 
 class OsRas;
+
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 constexpr uint32_t mockHandleCount = 2u;
 constexpr uint32_t mockHandleCountForSubDevice = 4u;
 struct SysmanRasFixture : public SysmanDeviceFixture {
@@ -646,4 +649,5 @@ TEST_F(SysmanRasMultiDeviceFixture, GivenValidRasHandleWhenCallingzesRasGetState
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler.h b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler.h
index d4151b1478..e6c480f48a 100644
--- a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler.h
+++ b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler.h
@@ -6,10 +6,12 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/linux/sysman_fs_access.h"
 #include "level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 const std::string preemptTimeoutMilliSecs("preempt_timeout_ms");
@@ -298,4 +300,5 @@ class PublicLinuxSchedulerImp : public L0::Sysman::LinuxSchedulerImp {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler_prelim.h b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler_prelim.h
index dd8767f554..ed7939da0b 100644
--- a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler_prelim.h
@@ -16,6 +16,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 const std::string preemptTimeoutMilliSecs("preempt_timeout_ms");
@@ -597,4 +598,5 @@ class PublicLinuxSchedulerImp : public L0::Sysman::LinuxSchedulerImp {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/test_zes_scheduler.cpp b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/test_zes_scheduler.cpp
index 7735a7b238..7658ed9c0a 100644
--- a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/test_zes_scheduler.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/test_zes_scheduler.cpp
@@ -10,7 +10,9 @@
 #include "level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 constexpr uint32_t handleComponentCount = 4u;
 constexpr uint64_t convertMilliToMicro = 1000u;
 constexpr uint64_t defaultTimeoutMilliSecs = 650u;
@@ -636,4 +638,5 @@ TEST_F(SysmanMultiDeviceFixture, GivenValidDevicePointerWhenGettingSchedProperti
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/test_zes_scheduler_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/test_zes_scheduler_prelim.cpp
index 014e5b7665..67003cb4f8 100644
--- a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/test_zes_scheduler_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/test_zes_scheduler_prelim.cpp
@@ -12,7 +12,9 @@
 using namespace NEO;
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
+
 constexpr uint32_t handleComponentCount = 5u;
 constexpr uint32_t handleComponentCountForMultiDeviceFixture = 4u;
 constexpr uint64_t convertMilliToMicro = 1000u;
@@ -1037,4 +1039,5 @@ TEST_F(SysmanMultiDeviceSchedulerFixture, GivenComponentCountZeroWithEngineInfoR
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/standby/linux/mock_sysfs_standby.h b/level_zero/sysman/test/unit_tests/sources/standby/linux/mock_sysfs_standby.h
index e6190e01f8..10517de2f3 100644
--- a/level_zero/sysman/test/unit_tests/sources/standby/linux/mock_sysfs_standby.h
+++ b/level_zero/sysman/test/unit_tests/sources/standby/linux/mock_sysfs_standby.h
@@ -12,6 +12,7 @@
 #include "level_zero/sysman/source/standby/linux/sysman_os_standby_imp.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 const std::string standbyModeFile("gt/gt0/rc6_enable");
@@ -104,5 +105,7 @@ class PublicLinuxStandbyImp : public L0::Sysman::LinuxStandbyImp {
     PublicLinuxStandbyImp(L0::Sysman::OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_t subdeviceId) : L0::Sysman::LinuxStandbyImp(pOsSysman, onSubdevice, subdeviceId) {}
     using L0::Sysman::LinuxStandbyImp::pSysfsAccess;
 };
+
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/standby/linux/test_zes_sysman_standby.cpp b/level_zero/sysman/test/unit_tests/sources/standby/linux/test_zes_sysman_standby.cpp
index 65c4b41269..3beb12ce17 100644
--- a/level_zero/sysman/test/unit_tests/sources/standby/linux/test_zes_sysman_standby.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/standby/linux/test_zes_sysman_standby.cpp
@@ -9,6 +9,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/standby/linux/mock_sysfs_standby.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr int standbyModeDefault = 1;
@@ -334,4 +335,5 @@ TEST_F(ZesStandbyMultiDeviceFixture, GivenOnSubdeviceNotSetWhenValidatingosStand
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/temperature/linux/mock_sysfs_temperature.h b/level_zero/sysman/test/unit_tests/sources/temperature/linux/mock_sysfs_temperature.h
index a6a803a7bc..2c79fcdce9 100644
--- a/level_zero/sysman/test/unit_tests/sources/temperature/linux/mock_sysfs_temperature.h
+++ b/level_zero/sysman/test/unit_tests/sources/temperature/linux/mock_sysfs_temperature.h
@@ -6,12 +6,14 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
 #include "level_zero/sysman/source/linux/sysman_fs_access.h"
 #include "level_zero/sysman/source/temperature/linux/sysman_os_temperature_imp.h"
 #include "level_zero/sysman/source/temperature/sysman_temperature_imp.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint8_t memory0MaxTemperature = 0x12;
@@ -170,5 +172,7 @@ class PublicLinuxTemperatureImp : public L0::Sysman::LinuxTemperatureImp {
     using L0::Sysman::LinuxTemperatureImp::pPmt;
     using L0::Sysman::LinuxTemperatureImp::type;
 };
+
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
\ No newline at end of file
diff --git a/level_zero/sysman/test/unit_tests/sources/temperature/linux/test_zes_temperature.cpp b/level_zero/sysman/test/unit_tests/sources/temperature/linux/test_zes_temperature.cpp
index 170764f501..01bfd3f2a4 100644
--- a/level_zero/sysman/test/unit_tests/sources/temperature/linux/test_zes_temperature.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/temperature/linux/test_zes_temperature.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/temperature/linux/mock_sysfs_temperature.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t handleComponentCountForTwoTileDevices = 6u;
@@ -373,4 +374,5 @@ HWTEST2_F(SysmanDeviceTemperatureFixture, GivenValidTempHandleWhenGettingTempera
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/temperature/windows/mock_temperature.h b/level_zero/sysman/test/unit_tests/sources/temperature/windows/mock_temperature.h
index 9b0dc2ddb8..81ae170b2f 100644
--- a/level_zero/sysman/test/unit_tests/sources/temperature/windows/mock_temperature.h
+++ b/level_zero/sysman/test/unit_tests/sources/temperature/windows/mock_temperature.h
@@ -6,10 +6,12 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/temperature/sysman_temperature_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t temperatureHandleComponentCount = 3u;
@@ -80,4 +82,5 @@ struct TemperatureKmdSysManager : public MockKmdSysManager {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/temperature/windows/test_zes_temperature.cpp b/level_zero/sysman/test/unit_tests/sources/temperature/windows/test_zes_temperature.cpp
index ffb8b53665..32603672c2 100644
--- a/level_zero/sysman/test/unit_tests/sources/temperature/windows/test_zes_temperature.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/temperature/windows/test_zes_temperature.cpp
@@ -10,6 +10,7 @@
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class SysmanDeviceTemperatureFixture : public SysmanDeviceFixture {
@@ -133,4 +134,5 @@ TEST_F(SysmanDeviceTemperatureFixture, GivenValidTempHandleWhenSettingTemperatur
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h b/level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h
index 1d630baab4..db15276570 100644
--- a/level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h
+++ b/level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h
@@ -11,6 +11,7 @@
 #include "level_zero/zes_api.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 constexpr uint32_t mockKmdVersionMajor = 1;
@@ -511,4 +512,5 @@ struct MockKmdSysManager : public L0::Sysman::KmdSysManager {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_driver.h b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_driver.h
index 0baa8f7528..c438244883 100644
--- a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_driver.h
+++ b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_driver.h
@@ -6,9 +6,11 @@
  */
 
 #pragma once
+
 #include "level_zero/sysman/source/sysman_driver_imp.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 struct MockSysmanDriver : public ::L0::Sysman::SysmanDriverImp {
@@ -30,4 +32,5 @@ struct MockSysmanDriver : public ::L0::Sysman::SysmanDriverImp {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h
index aa12da2299..ba65dffddf 100644
--- a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h
+++ b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h
@@ -17,6 +17,7 @@
 using namespace NEO;
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class PublicWddmSysmanImp : public L0::Sysman::WddmSysmanImp {
@@ -60,4 +61,5 @@ class SysmanDeviceFixture : public ::testing::Test {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_wddm.h b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_wddm.h
index 37c3702507..7bfffe8761 100644
--- a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_wddm.h
+++ b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_wddm.h
@@ -10,6 +10,7 @@
 #include "shared/test/common/mocks/mock_wddm.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class SysmanMockWddm : public NEO::WddmMock {
@@ -18,4 +19,5 @@ class SysmanMockWddm : public NEO::WddmMock {
 };
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/windows/test_sysman_driver.cpp b/level_zero/sysman/test/unit_tests/sources/windows/test_sysman_driver.cpp
index 5c62b78634..6cd329097e 100644
--- a/level_zero/sysman/test/unit_tests/sources/windows/test_sysman_driver.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/windows/test_sysman_driver.cpp
@@ -13,6 +13,7 @@
 #include <cstring>
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 TEST(zesInit, whenCallingZesInitThenInitializeOnDriverIsCalled) {
@@ -40,4 +41,5 @@ TEST(zesInit, whenCallingZesInitWithoutGpuOnlyFlagThenInitializeOnDriverIsNotCal
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/windows/test_sysman_manager.cpp b/level_zero/sysman/test/unit_tests/sources/windows/test_sysman_manager.cpp
index 6ebbdf6f3b..f39fd19031 100644
--- a/level_zero/sysman/test/unit_tests/sources/windows/test_sysman_manager.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/windows/test_sysman_manager.cpp
@@ -11,6 +11,7 @@
 #include "gtest/gtest.h"
 
 namespace L0 {
+namespace Sysman {
 namespace ult {
 
 class SysmanKmdManagerFixture : public ::testing::Test {
@@ -239,4 +240,5 @@ TEST_F(SysmanKmdManagerFixture, GivenAllowSetCallsFalseAndTDROccuredWhenRequestM
 }
 
 } // namespace ult
+} // namespace Sysman
 } // namespace L0