diff --git a/runtime/kernel/kernel.cpp b/runtime/kernel/kernel.cpp
index e723b91f18..7ae40b7495 100644
--- a/runtime/kernel/kernel.cpp
+++ b/runtime/kernel/kernel.cpp
@@ -1093,7 +1093,7 @@ cl_int Kernel::setArgBuffer(uint32_t argIndex,
                             const void *argVal) {
 
     if (argSize != sizeof(cl_mem *))
-        return CL_INVALID_ARG_VALUE;
+        return CL_INVALID_ARG_SIZE;
 
     const auto &kernelArgInfo = kernelInfo.kernelArgInfo[argIndex];
     auto clMem = reinterpret_cast<const cl_mem *>(argVal);
diff --git a/unit_tests/mem_obj/buffer_set_arg_tests.cpp b/unit_tests/mem_obj/buffer_set_arg_tests.cpp
index fc3e927c1d..1c156e2d9d 100644
--- a/unit_tests/mem_obj/buffer_set_arg_tests.cpp
+++ b/unit_tests/mem_obj/buffer_set_arg_tests.cpp
@@ -126,10 +126,10 @@ TEST_F(BufferSetArgTest, setKernelArgBuffer) {
     EXPECT_EQ((void *)((uintptr_t)buffer->getGraphicsAllocation()->getGpuAddress()), *pKernelArg);
 }
 
-TEST_F(BufferSetArgTest, setKernelArgBufferWithWrongSizeReturnsInvalidArgValueError) {
+TEST_F(BufferSetArgTest, givenInvalidSizeWhenSettingKernelArgBufferThenReturnClInvalidArgSize) {
     cl_mem arg = buffer;
     cl_int err = pKernel->setArgBuffer(0, sizeof(cl_mem) + 1, arg);
-    EXPECT_EQ(CL_INVALID_ARG_VALUE, err);
+    EXPECT_EQ(CL_INVALID_ARG_SIZE, err);
 }
 
 HWTEST_F(BufferSetArgTest, givenSetArgBufferWhenNullArgStatefulThenProgramNullSurfaceState) {