diff --git a/runtime/kernel/kernel.cpp b/runtime/kernel/kernel.cpp
index f9079b27cd..41a04eaa83 100644
--- a/runtime/kernel/kernel.cpp
+++ b/runtime/kernel/kernel.cpp
@@ -2062,7 +2062,7 @@ cl_int Kernel::checkCorrectImageAccessQualifier(cl_uint argIndex,
                 return CL_INVALID_ARG_VALUE;
             }
         } else {
-            return CL_INVALID_VALUE;
+            return CL_INVALID_ARG_VALUE;
         }
     }
     return CL_SUCCESS;
diff --git a/unit_tests/kernel/kernel_image_arg_tests.cpp b/unit_tests/kernel/kernel_image_arg_tests.cpp
index f6a074af2a..fdaf59ba09 100644
--- a/unit_tests/kernel/kernel_image_arg_tests.cpp
+++ b/unit_tests/kernel/kernel_image_arg_tests.cpp
@@ -137,7 +137,7 @@ TEST_F(KernelImageArgTest, givenImageWithWriteOnlyAccessAndReadOnlyArgWhenCheckC
     EXPECT_EQ(retVal, CL_INVALID_ARG_INDEX);
 }
 
-TEST_F(KernelImageArgTest, givenImageWithReadOnlyAccessAndWriteOnlyArgWhenCheckCorrectImageAccessQualifierIsCalledThenRetValNotValid) {
+TEST_F(KernelImageArgTest, givenImageWithReadOnlyAccessAndWriteOnlyArgWhenCheckCorrectImageAccessQualifierIsCalledThenReturnsInvalidArgValue) {
     cl_image_format imgFormat = {CL_RGBA, CL_UNORM_INT8};
     cl_image_desc imgDesc = {};
     imgDesc.image_type = CL_MEM_OBJECT_IMAGE2D;
@@ -154,7 +154,7 @@ TEST_F(KernelImageArgTest, givenImageWithReadOnlyAccessAndWriteOnlyArgWhenCheckC
     Image *image = NULL;
     memObj = image;
     retVal = pKernel->checkCorrectImageAccessQualifier(0, sizeof(memObj), &memObj);
-    EXPECT_EQ(retVal, CL_INVALID_VALUE);
+    EXPECT_EQ(retVal, CL_INVALID_ARG_VALUE);
 }
 
 TEST_F(KernelImageArgTest, givenImageWithReadOnlyAccessAndReadOnlyArgWhenCheckCorrectImageAccessQualifierIsCalledThenRetValNotValid) {