diff --git a/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp b/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp
index d5bcb70366..085d54e6e6 100644
--- a/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp
+++ b/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp
@@ -7,7 +7,7 @@
 
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "hw_cmds.h"
 
diff --git a/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp b/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp
index 3043f3fafd..771ab66100 100644
--- a/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp
+++ b/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp
@@ -8,7 +8,7 @@
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "hw_cmds.h"
 
diff --git a/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp b/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp
index 0b7dcd6c3d..f13bd08643 100644
--- a/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp
+++ b/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp
@@ -7,7 +7,7 @@
 
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "hw_cmds.h"
 
diff --git a/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp b/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp
index db4580a108..a2860813b9 100644
--- a/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp
+++ b/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp
@@ -11,7 +11,7 @@
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp
index 826110102e..26040295d9 100644
--- a/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp
+++ b/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp
@@ -12,7 +12,7 @@
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp b/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp
index 9547db2c89..7e81f4bbac 100644
--- a/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp
+++ b/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp
@@ -11,7 +11,7 @@
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp
index 801b87c3a0..73cd7f430a 100644
--- a/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp
+++ b/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp
@@ -15,7 +15,7 @@
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp
index 6317bf72ca..9577826368 100644
--- a/shared/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp
+++ b/shared/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp
@@ -10,7 +10,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "hw_cmds.h"
 
diff --git a/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp b/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp
index 9ab7efc158..a24d973659 100644
--- a/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp
+++ b/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp
@@ -11,7 +11,7 @@
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp b/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp
index f5ea35d93f..93a500739f 100644
--- a/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp
+++ b/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp
@@ -15,7 +15,7 @@
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp
index f51e97a1ec..e21365013b 100644
--- a/shared/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp
+++ b/shared/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp
@@ -11,7 +11,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
+#include "shared/test/unit_test/os_interface/windows/product_helper_win_tests.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp b/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp
index 5f6fbf8174..911568b7af 100644
--- a/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp
+++ b/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp
@@ -7,7 +7,7 @@
 
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "hw_cmds.h"
 
diff --git a/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests_bxt.cpp b/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests_bxt.cpp
index bc7e9a6c6c..d299814fd1 100644
--- a/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests_bxt.cpp
+++ b/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests_bxt.cpp
@@ -8,7 +8,7 @@
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "hw_cmds.h"
 
diff --git a/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp b/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
index 0f408f8805..e47d3a2233 100644
--- a/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
+++ b/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
@@ -8,7 +8,7 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "hw_cmds.h"
 
diff --git a/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp b/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp
index b585443572..5f6540e02c 100644
--- a/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp
+++ b/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp
@@ -7,7 +7,7 @@
 
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "hw_cmds.h"
 
diff --git a/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp b/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
index 3911d4b618..da746fe786 100644
--- a/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
+++ b/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
@@ -8,7 +8,7 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "hw_cmds.h"
 
diff --git a/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp b/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp
index 494f4d8205..5c12a8c205 100644
--- a/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp
+++ b/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp
@@ -7,7 +7,7 @@
 
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "hw_cmds.h"
 
diff --git a/shared/test/unit_test/os_interface/linux/CMakeLists.txt b/shared/test/unit_test/os_interface/linux/CMakeLists.txt
index d40dad7ec3..362a0af9bb 100644
--- a/shared/test/unit_test/os_interface/linux/CMakeLists.txt
+++ b/shared/test/unit_test/os_interface/linux/CMakeLists.txt
@@ -32,7 +32,7 @@ set(NEO_CORE_OS_INTERFACE_TESTS_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_uuid_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_version_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/file_logger_linux_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_linux_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/product_helper_linux_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_uuid_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_context_linux_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_linux_tests.cpp
diff --git a/shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp b/shared/test/unit_test/os_interface/linux/product_helper_linux_tests.cpp
similarity index 98%
rename from shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp
rename to shared/test/unit_test/os_interface/linux/product_helper_linux_tests.cpp
index c8169d625a..fadbe8a3aa 100644
--- a/shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/product_helper_linux_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/helpers/gfx_core_helper.h"
@@ -444,3 +444,8 @@ HWTEST2_F(HwConfigLinux, givenSliceCountWhenConfigureHwInfoDrmThenProperInitiali
         EXPECT_TRUE(outHwInfo.gtSystemInfo.SliceInfo[i].Enabled);
     }
 }
+
+HWTEST2_F(ProductHelperTest, givenProductHelperWhenIsPlatformQueryNotSupportedThenReturnFalse, IsAtLeastMtl) {
+
+    EXPECT_TRUE(productHelper->isPlatformQuerySupported());
+}
diff --git a/shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h b/shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h
similarity index 100%
rename from shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h
rename to shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h
diff --git a/shared/test/unit_test/os_interface/windows/CMakeLists.txt b/shared/test/unit_test/os_interface/windows/CMakeLists.txt
index 4b2d6ab970..888bdd5baa 100644
--- a/shared/test/unit_test/os_interface/windows/CMakeLists.txt
+++ b/shared/test/unit_test/os_interface/windows/CMakeLists.txt
@@ -14,8 +14,8 @@ if(WIN32)
                  ${CMAKE_CURRENT_SOURCE_DIR}/file_logger_win_tests.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/wddm_adapter_luid_tests.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper_tests_win.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/product_helper_win_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/product_helper_win_tests.h
                  ${CMAKE_CURRENT_SOURCE_DIR}/os_context_win_tests.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.h
diff --git a/shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp b/shared/test/unit_test/os_interface/windows/product_helper_win_tests.cpp
similarity index 97%
rename from shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp
rename to shared/test/unit_test/os_interface/windows/product_helper_win_tests.cpp
index a4f055e27a..7c456a87a1 100644
--- a/shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp
+++ b/shared/test/unit_test/os_interface/windows/product_helper_win_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
+#include "shared/test/unit_test/os_interface/windows/product_helper_win_tests.h"
 
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/gfx_core_helper.h"
diff --git a/shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.h b/shared/test/unit_test/os_interface/windows/product_helper_win_tests.h
similarity index 95%
rename from shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.h
rename to shared/test/unit_test/os_interface/windows/product_helper_win_tests.h
index 840a10a21d..6c9da804f7 100644
--- a/shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.h
+++ b/shared/test/unit_test/os_interface/windows/product_helper_win_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/linux/hw_info_config_tests_xe_hp_sdv.cpp b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/linux/hw_info_config_tests_xe_hp_sdv.cpp
index 81c0661aab..61911e641e 100644
--- a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/linux/hw_info_config_tests_xe_hp_sdv.cpp
+++ b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/linux/hw_info_config_tests_xe_hp_sdv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,7 @@
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp
index 4e9f22b129..8f4147573d 100644
--- a/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp
+++ b/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp
@@ -17,7 +17,7 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/xe_hpc_core/pvc/product_configs_pvc.h"
 #include "shared/test/unit_test/fixtures/product_config_fixture.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp
index 82549f2054..af8a6f83c5 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp
@@ -11,7 +11,7 @@
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2.cpp
index c0b256ccef..0b02628d96 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
+#include "shared/test/unit_test/os_interface/windows/product_helper_win_tests.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_extra_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_extra_dg2.cpp
index 2183e0bdf4..2bfea035c4 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_extra_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_extra_dg2.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
+#include "shared/test/unit_test/os_interface/windows/product_helper_win_tests.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe_hpg_core/mtl/linux/hw_info_config_tests_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/linux/hw_info_config_tests_mtl.cpp
index 792117a1b4..b3c5029edf 100644
--- a/shared/test/unit_test/xe_hpg_core/mtl/linux/hw_info_config_tests_mtl.cpp
+++ b/shared/test/unit_test/xe_hpg_core/mtl/linux/hw_info_config_tests_mtl.cpp
@@ -11,7 +11,7 @@
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
-#include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
+#include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 using namespace NEO;