diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp
index 0ffe5fb497..d0b2db8d59 100644
--- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp
+++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp
@@ -219,7 +219,6 @@ HWTEST2_F(CommandListAppendRangesBarrierXe2AndLater, givenCallToAppendRangesBarr
 using CommandListXe2AndLaterPreemptionTest = Test<ModuleMutableCommandListFixture>;
 HWTEST2_F(CommandListXe2AndLaterPreemptionTest, givenAppendLaunchKernelWhenKernelFlagRequiresDisablePreemptionThenExpectInterfaceDescriptorDataDisablePreemption, Platforms) {
     using DefaultWalkerType = typename FamilyType::DefaultWalkerType;
-    using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA;
 
     auto &container = commandList->getCmdContainer();
     auto &cmdListStream = *container.getCommandStream();
@@ -239,7 +238,7 @@ HWTEST2_F(CommandListXe2AndLaterPreemptionTest, givenAppendLaunchKernelWhenKerne
         ptrOffset(cmdListStream.getCpuBase(), sizeBefore),
         sizeAfter - sizeBefore));
 
-    auto walkerCmds = findAll<DefaultWalkerType *>(cmdList.begin(), cmdList.end());
+    auto walkerCmds = NEO::UnitTestHelper<FamilyType>::findAllWalkerTypeCmds(cmdList.begin(), cmdList.end());
     ASSERT_EQ(1u, walkerCmds.size());
 
     auto walkerCmd = reinterpret_cast<DefaultWalkerType *>(*walkerCmds[0]);
@@ -274,7 +273,7 @@ HWTEST2_F(CommandListXe2AndLaterPreemptionTest,
         ptrOffset(cmdListStream.getCpuBase(), sizeBefore),
         sizeAfter - sizeBefore));
 
-    auto walkerCmds = findAll<DefaultWalkerType *>(cmdList.begin(), cmdList.end());
+    auto walkerCmds = NEO::UnitTestHelper<FamilyType>::findAllWalkerTypeCmds(cmdList.begin(), cmdList.end());
     ASSERT_EQ(1u, walkerCmds.size());
 
     auto walkerCmd = reinterpret_cast<DefaultWalkerType *>(*walkerCmds[0]);
@@ -309,7 +308,7 @@ HWTEST2_F(CommandListXe2AndLaterPreemptionTest,
         ptrOffset(cmdListStream.getCpuBase(), sizeBefore),
         sizeAfter - sizeBefore));
 
-    auto walkerCmds = findAll<DefaultWalkerType *>(cmdList.begin(), cmdList.end());
+    auto walkerCmds = NEO::UnitTestHelper<FamilyType>::findAllWalkerTypeCmds(cmdList.begin(), cmdList.end());
     ASSERT_EQ(1u, walkerCmds.size());
 
     auto walkerCmd = reinterpret_cast<DefaultWalkerType *>(*walkerCmds[0]);
@@ -344,7 +343,7 @@ HWTEST2_F(CommandListXe2AndLaterPreemptionTest,
         ptrOffset(cmdListStream.getCpuBase(), sizeBefore),
         sizeAfter - sizeBefore));
 
-    auto walkerCmds = findAll<DefaultWalkerType *>(cmdList.begin(), cmdList.end());
+    auto walkerCmds = NEO::UnitTestHelper<FamilyType>::findAllWalkerTypeCmds(cmdList.begin(), cmdList.end());
     ASSERT_EQ(1u, walkerCmds.size());
 
     auto walkerCmd = reinterpret_cast<DefaultWalkerType *>(*walkerCmds[0]);
diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp
index 389e348a1f..0b4ebdd468 100644
--- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp
+++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp
@@ -3004,7 +3004,7 @@ HWTEST2_F(CommandListAppendLaunchKernel,
         ptrOffset(cmdStream->getCpuBase(), commandStreamOffset),
         cmdStream->getUsed() - commandStreamOffset));
 
-    auto computeWalkerList = findAll<DefaultWalkerType *>(cmdList.begin(), cmdList.end());
+    auto computeWalkerList = NEO::UnitTestHelper<FamilyType>::findAllWalkerTypeCmds(cmdList.begin(), cmdList.end());
     ASSERT_EQ(1u, computeWalkerList.size());
 
     auto walkerGfxMemory = reinterpret_cast<DefaultWalkerType *>(*computeWalkerList[0]);