diff --git a/opencl/test/unit_test/sharings/sharing_factory_tests.cpp b/opencl/test/unit_test/sharings/sharing_factory_tests.cpp
index 57c9789b71..77209f64a2 100644
--- a/opencl/test/unit_test/sharings/sharing_factory_tests.cpp
+++ b/opencl/test/unit_test/sharings/sharing_factory_tests.cpp
@@ -169,8 +169,8 @@ TEST(SharingFactoryTests, givenFactoryWithSharingWhenAskedForExtensionThenString
     stateRestore.registerSharing<TestedSharingBuilderFactory>(SharingType::CLGL_SHARING);
 
     auto ext = stateRestore.getExtensions(nullptr);
-    EXPECT_EQ(TestedSharingBuilderFactory::extension.length(), ext.length());
-    EXPECT_STREQ(TestedSharingBuilderFactory::extension.c_str(), ext.c_str());
+    EXPECT_LE(TestedSharingBuilderFactory::extension.length(), ext.length());
+    EXPECT_THAT(ext.c_str(), ::testing::HasSubstr(TestedSharingBuilderFactory::extension.c_str()));
 }
 
 TEST(SharingFactoryTests, givenFactoryWithSharingWhenDispatchFillRequestedThenMethodsAreInvoked) {
diff --git a/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp b/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp
index 92d9812920..8ad61ffa10 100644
--- a/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp
+++ b/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp
@@ -43,4 +43,12 @@ TEST_F(clGetExtensionFunctionAddressTests, givenEnabledFormatQueryWhenGettingFun
     auto retVal = clGetExtensionFunctionAddress("clGetSupportedVA_APIMediaSurfaceFormatsINTEL");
     EXPECT_EQ(retVal, reinterpret_cast<void *>(clGetSupportedVA_APIMediaSurfaceFormatsINTEL));
 }
+
+TEST_F(clGetExtensionFunctionAddressTests, givenDisabledFormatQueryWhenGettingFuncionAddressThenNullptrIsReturned) {
+    DebugManagerStateRestore restorer;
+    DebugManager.flags.EnableFormatQuery.set(false);
+
+    auto retVal = clGetExtensionFunctionAddress("clGetSupportedVA_APIMediaSurfaceFormatsINTEL");
+    EXPECT_EQ(retVal, nullptr);
+}
 } // namespace ULT
diff --git a/opencl/test/unit_test/test_files/igdrcl.config b/opencl/test/unit_test/test_files/igdrcl.config
index 6201a7ac83..3b076df8d0 100644
--- a/opencl/test/unit_test/test_files/igdrcl.config
+++ b/opencl/test/unit_test/test_files/igdrcl.config
@@ -125,7 +125,7 @@ EnableComputeWorkSizeSquared = 0
 EnableVaLibCalls = -1
 EnableExtendedVaFormats = 0
 AddClGlSharing = 0
-EnableFormatQuery = 0
+EnableFormatQuery = 1
 EnableFreeMemory = 0
 ForceSamplerLowFilteringPrecision = 0
 MakeAllBuffersResident = 0
diff --git a/shared/source/debug_settings/debug_variables_base.inl b/shared/source/debug_settings/debug_variables_base.inl
index f7c01d3b7a..894d2e4106 100644
--- a/shared/source/debug_settings/debug_variables_base.inl
+++ b/shared/source/debug_settings/debug_variables_base.inl
@@ -185,7 +185,7 @@ DECLARE_DEBUG_VARIABLE(bool, EnableMultiRootDeviceContexts, false, "Enables supp
 DECLARE_DEBUG_VARIABLE(bool, EnableComputeWorkSizeSquared, false, "Enables algorithm to compute the most squared work group as possible")
 DECLARE_DEBUG_VARIABLE(bool, EnableExtendedVaFormats, false, "Enable more formats in cl-va sharing")
 DECLARE_DEBUG_VARIABLE(bool, AddClGlSharing, false, "Add cl-gl extension")
-DECLARE_DEBUG_VARIABLE(bool, EnableFormatQuery, false, "Enable sharing format querying")
+DECLARE_DEBUG_VARIABLE(bool, EnableFormatQuery, true, "Enable sharing format querying")
 DECLARE_DEBUG_VARIABLE(bool, EnableFreeMemory, false, "Enable freeMemory in memory manager")
 DECLARE_DEBUG_VARIABLE(bool, ForceSamplerLowFilteringPrecision, false, "Force Low Filtering Precision Sampler mode")
 DECLARE_DEBUG_VARIABLE(bool, EngineInstancedSubDevices, false, "Create subdevices assigned to specific engine")