diff --git a/opencl/source/helpers/surface_formats.cpp b/opencl/source/helpers/surface_formats.cpp
index b3082ee721961..33b51b3e9d7c3 100644
--- a/opencl/source/helpers/surface_formats.cpp
+++ b/opencl/source/helpers/surface_formats.cpp
@@ -60,13 +60,13 @@ namespace NEO {
     {{CL_RG,              CL_SNORM_INT8},     {GMM_FORMAT_R8G8_SNORM_TYPE,          GFX3DSTATE_SURFACEFORMAT_R8G8_SNORM              , 0, 2, 1, 2}}, \
     {{CL_RG,              CL_SNORM_INT16},    {GMM_FORMAT_R16G16_SNORM_TYPE,        GFX3DSTATE_SURFACEFORMAT_R16G16_SNORM            , 0, 2, 2, 4}}, \
     {{CL_RGBA,            CL_SNORM_INT8},     {GMM_FORMAT_R8G8B8A8_SNORM_TYPE,      GFX3DSTATE_SURFACEFORMAT_R8G8B8A8_SNORM          , 0, 4, 1, 4}}, \
-    {{CL_RGBA,            CL_SNORM_INT16},    {GMM_FORMAT_R16G16B16A16_SNORM_TYPE,  GFX3DSTATE_SURFACEFORMAT_R16G16B16A16_SNORM      , 0, 4, 2, 8}}, \
-    {{CL_INTENSITY,       CL_FLOAT},          {GMM_FORMAT_GENERIC_32BIT,            GFX3DSTATE_SURFACEFORMAT_I32_FLOAT               , 0, 1, 4, 4}}
+    {{CL_RGBA,            CL_SNORM_INT16},    {GMM_FORMAT_R16G16B16A16_SNORM_TYPE,  GFX3DSTATE_SURFACEFORMAT_R16G16B16A16_SNORM      , 0, 4, 2, 8}}
 
 #define READONLYFORMATS \
     {{CL_INTENSITY,       CL_UNORM_INT8},     {GMM_FORMAT_GENERIC_8BIT,             GFX3DSTATE_SURFACEFORMAT_I8_UNORM                , 0, 1, 1, 1}}, \
     {{CL_INTENSITY,       CL_UNORM_INT16},    {GMM_FORMAT_GENERIC_16BIT,            GFX3DSTATE_SURFACEFORMAT_I16_UNORM               , 0, 1, 2, 2}}, \
     {{CL_INTENSITY,       CL_HALF_FLOAT},     {GMM_FORMAT_GENERIC_16BIT,            GFX3DSTATE_SURFACEFORMAT_I16_FLOAT               , 0, 1, 2, 2}}, \
+    {{CL_INTENSITY,       CL_FLOAT},          {GMM_FORMAT_GENERIC_32BIT,            GFX3DSTATE_SURFACEFORMAT_I32_FLOAT               , 0, 1, 4, 4}}, \
     {{CL_A,               CL_UNORM_INT16},    {GMM_FORMAT_GENERIC_16BIT,            GFX3DSTATE_SURFACEFORMAT_A16_UNORM               , 0, 1, 2, 2}}, \
     {{CL_A,               CL_HALF_FLOAT},     {GMM_FORMAT_GENERIC_16BIT,            GFX3DSTATE_SURFACEFORMAT_A16_FLOAT               , 0, 1, 2, 2}}, \
     {{CL_A,               CL_FLOAT},          {GMM_FORMAT_GENERIC_32BIT,            GFX3DSTATE_SURFACEFORMAT_A32_FLOAT               , 0, 1, 4, 4}}
diff --git a/opencl/test/unit_test/api/cl_create_image_tests.cpp b/opencl/test/unit_test/api/cl_create_image_tests.cpp
index aec3cdf8244a9..24d95575749ee 100644
--- a/opencl/test/unit_test/api/cl_create_image_tests.cpp
+++ b/opencl/test/unit_test/api/cl_create_image_tests.cpp
@@ -954,26 +954,6 @@ TEST_F(clCreateImage2DTest, GivenValidParametersWhenCreating2DImageThenImageIsCr
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
-TEST_F(clCreateImage2DTest, GivenValidParametersWhenCreating2DImageAndImageFormatIsClIntencityClFloatThenImageIsCreatedAndSuccessReturned) {
-    REQUIRE_IMAGE_SUPPORT_OR_SKIP(pContext);
-    cl_image_format imageFormatRW = {CL_INTENSITY, CL_FLOAT};
-    auto image = clCreateImage2D(
-        pContext,
-        CL_MEM_READ_WRITE,
-        &imageFormatRW,
-        10,
-        10,
-        0,
-        0,
-        &retVal);
-
-    EXPECT_EQ(CL_SUCCESS, retVal);
-    EXPECT_NE(nullptr, image);
-
-    retVal = clReleaseMemObject(image);
-    EXPECT_EQ(CL_SUCCESS, retVal);
-}
-
 TEST_F(clCreateImage2DTest, GivenNoPtrToReturnValueWhenCreating2DImageThenImageIsCreated) {
     REQUIRE_IMAGE_SUPPORT_OR_SKIP(pContext);
     auto image = clCreateImage2D(