diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp
index fa163dbd97..d3fd95a0f3 100644
--- a/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp
+++ b/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp
@@ -276,6 +276,11 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubInlineDataTest, givenCrossThreadSize
         crossThreadData += inlineSize - offsetInBytes;
 
         void *payloadData = ih.getCpuBase();
+
+        auto pImplicitArgs = kernel->getImplicitArgs();
+        if (pImplicitArgs) {
+            payloadData = ptrOffset(payloadData, alignUp(pImplicitArgs->getSize(), MemoryConstants::cacheLineSize));
+        }
         EXPECT_EQ(0, memcmp(payloadData, crossThreadData, crossThreadDataSize));
     },
                walkerVariant);
@@ -445,7 +450,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubHwLocalIdsTest, givenNonPowOf2LocalW
 
             EXPECT_EQ(expectedEmitLocal, walker->getEmitLocalId());
             EXPECT_EQ(1u, walker->getGenerateLocalId());
-            EXPECT_EQ(4u, walker->getWalkOrder());
+            EXPECT_EQ(0u, walker->getWalkOrder());
         }
     },
                walkerVariant);
diff --git a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h
index b3e08b3499..a957f923fa 100644
--- a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h
+++ b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -95,6 +95,7 @@ class SimpleArgNonUniformKernelFixture : public ProgramFixture {
             "simple_nonuniform",
             "");
         ASSERT_NE(nullptr, pProgram);
+        pProgram->allowNonUniform = true;
 
         retVal = pProgram->build(
             pProgram->getDevices(),