diff --git a/level_zero/core/test/unit_tests/fixtures/module_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/module_fixture.cpp
index 0a3fc53192..b6bc2856fb 100644
--- a/level_zero/core/test/unit_tests/fixtures/module_fixture.cpp
+++ b/level_zero/core/test/unit_tests/fixtures/module_fixture.cpp
@@ -73,8 +73,6 @@ void ModuleImmutableDataFixture::MockKernel::setCrossThreadData(uint32_t dataSiz
 }
 
 void ModuleImmutableDataFixture::setUp() {
-    DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
-
     auto hwInfo = NEO::defaultHwInfo.get();
     if (DebugManager.flags.OverrideRevision.get() != -1) {
         this->copyHwInfo = *NEO::defaultHwInfo.get();
@@ -88,9 +86,6 @@ void ModuleImmutableDataFixture::setUp() {
 }
 
 void ModuleImmutableDataFixture::createModuleFromMockBinary(uint32_t perHwThreadPrivateMemorySize, bool isInternal, MockImmutableData *mockKernelImmData, std::initializer_list<ZebinTestData::appendElfAdditionalSection> additionalSections) {
-    DebugManagerStateRestore restore;
-    DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
-
     zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
     const auto &src = zebinData->storage;
 
@@ -138,13 +133,12 @@ L0::Module *ModuleFixture::ProxyModuleImp::create(L0::Device *device, const ze_m
 }
 
 void ModuleFixture::setUp() {
-    DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
+
     DeviceFixture::setUp();
     createModuleFromMockBinary();
 }
 
 void ModuleFixture::createModuleFromMockBinary(ModuleType type) {
-
     zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo());
     const auto &src = zebinData->storage;
 
@@ -189,8 +183,6 @@ void MultiDeviceModuleFixture::setUp() {
 }
 
 void MultiDeviceModuleFixture::createModuleFromMockBinary(uint32_t rootDeviceIndex) {
-    DebugManagerStateRestore restore;
-    DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
     auto device = driverHandle->devices[rootDeviceIndex];
     zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo());
     const auto &src = zebinData->storage;
diff --git a/level_zero/core/test/unit_tests/fixtures/module_fixture.h b/level_zero/core/test/unit_tests/fixtures/module_fixture.h
index 02d0667706..ffa8d1485e 100644
--- a/level_zero/core/test/unit_tests/fixtures/module_fixture.h
+++ b/level_zero/core/test/unit_tests/fixtures/module_fixture.h
@@ -116,7 +116,6 @@ struct ModuleImmutableDataFixture : public DeviceFixture {
     std::unique_ptr<MockModule> module;
     std::unique_ptr<ZebinTestData::ZebinWithL0TestCommonModule> zebinData;
     MockImmutableMemoryManager *memoryManager;
-    DebugManagerStateRestore restore;
 };
 
 struct ModuleFixture : public DeviceFixture {
@@ -147,7 +146,6 @@ struct ModuleFixture : public DeviceFixture {
     std::unique_ptr<L0::Module> module;
     std::unique_ptr<WhiteBox<::L0::Kernel>> kernel;
     std::unique_ptr<ZebinTestData::ZebinWithL0TestCommonModule> zebinData;
-    DebugManagerStateRestore restore;
 };
 
 struct MultiDeviceModuleFixture : public MultiDeviceFixture {
diff --git a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp
index 2031c23fba..9a2158b322 100644
--- a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp
+++ b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/compiler_interface/external_functions.h"
-#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device_binary_format/patchtokens_decoder.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
@@ -1393,8 +1392,6 @@ class KernelPropertiesTests : public ModuleFixture, public ::testing::Test {
         using KernelImp::kernelHasIndirectAccess;
     };
     void SetUp() override {
-        DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
-
         ModuleFixture::setUp();
 
         ze_kernel_desc_t kernelDesc = {};
@@ -1414,7 +1411,6 @@ class KernelPropertiesTests : public ModuleFixture, public ::testing::Test {
 
     ze_kernel_handle_t kernelHandle;
     MockKernel *kernel = nullptr;
-    DebugManagerStateRestore restore;
 };
 
 TEST_F(KernelPropertiesTests, givenKernelThenCorrectNameIsRetrieved) {
diff --git a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp
index 7603ca4cff..ce6cfe4f04 100644
--- a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp
+++ b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp
@@ -3127,9 +3127,6 @@ TEST_F(MultipleDevicePeerAllocationFailTest,
 
 struct MultipleDevicePeerAllocationTest : public ::testing::Test {
     void createModuleFromMockBinary(L0::Device *device, ModuleType type = ModuleType::User) {
-        DebugManagerStateRestore restorer;
-        DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
-
         auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo());
         const auto &src = zebinData->storage;
         ze_module_desc_t moduleDesc = {};
@@ -3144,7 +3141,7 @@ struct MultipleDevicePeerAllocationTest : public ::testing::Test {
 
     void SetUp() override {
         DebugManagerStateRestore restorer;
-        DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
+
         DebugManager.flags.CreateMultipleSubDevices.set(numSubDevices);
         VariableBackup<bool> mockDeviceFlagBackup(&MockDevice::createSingleDevice, false);
 
diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp
index 811e97ab40..4b44b8444d 100644
--- a/level_zero/core/test/unit_tests/sources/module/test_module.cpp
+++ b/level_zero/core/test/unit_tests/sources/module/test_module.cpp
@@ -2087,9 +2087,6 @@ HWTEST_F(MultiDeviceModuleSetArgBufferTest,
 using ContextModuleCreateTest = Test<DeviceFixture>;
 
 HWTEST_F(ContextModuleCreateTest, givenCallToCreateModuleThenModuleIsReturned) {
-    DebugManagerStateRestore restore;
-    DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
-
     auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo());
     const auto &src = zebinData->storage;
 
@@ -2113,8 +2110,6 @@ using ModuleTranslationUnitTest = Test<DeviceFixture>;
 struct MockModuleTU : public L0::ModuleTranslationUnit {
     MockModuleTU(L0::Device *device) : L0::ModuleTranslationUnit(device) {}
 
-    DebugManagerStateRestore restore;
-
     ze_result_t buildFromSpirV(const char *input, uint32_t inputSize, const char *buildOptions, const char *internalBuildOptions,
                                const ze_module_constants_t *pConstants) override {
         wasBuildFromSpirVCalled = true;
@@ -2126,7 +2121,6 @@ struct MockModuleTU : public L0::ModuleTranslationUnit {
     }
 
     ze_result_t createFromNativeBinary(const char *input, size_t inputSize) override {
-        DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
         wasCreateFromNativeBinaryCalled = true;
         return L0::ModuleTranslationUnit::createFromNativeBinary(input, inputSize);
     }
@@ -2139,6 +2133,7 @@ struct MockModuleTU : public L0::ModuleTranslationUnit {
 HWTEST_F(ModuleTranslationUnitTest, GivenRebuildPrecompiledKernelsFlagAndFileWithoutIntermediateCodeWhenCreatingModuleFromNativeBinaryThenModuleIsNotRecompiled) {
     DebugManagerStateRestore dgbRestorer;
     NEO::DebugManager.flags.RebuildPrecompiledKernels.set(true);
+
     auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo());
     const auto &src = zebinData->storage;
 
@@ -2816,8 +2811,6 @@ TEST(ModuleBuildLog, WhenTooSmallBufferIsPassedToGetStringThenErrorIsReturned) {
 using PrintfModuleTest = Test<DeviceFixture>;
 
 HWTEST_F(PrintfModuleTest, GivenModuleWithPrintfWhenKernelIsCreatedThenPrintfAllocationIsPlacedInResidencyContainer) {
-    DebugManagerStateRestore restore{};
-    DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
     auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo());
     const auto &src = zebinData->storage;
 
@@ -3152,9 +3145,8 @@ TEST_F(ModuleInitializeTest, whenModuleInitializeIsCalledThenCorrectResultIsRetu
     moduleDesc.pInputModule = reinterpret_cast<const uint8_t *>(src.data());
     moduleDesc.inputSize = src.size();
 
-    std::array<std::tuple<ze_result_t, bool, ModuleType, int32_t>, 6> testParams = {{
+    std::array<std::tuple<ze_result_t, bool, ModuleType, int32_t>, 5> testParams = {{
         {ZE_RESULT_SUCCESS, false, ModuleType::Builtin, -1},
-        {ZE_RESULT_SUCCESS, true, ModuleType::User, -1},
         {ZE_RESULT_SUCCESS, true, ModuleType::Builtin, 0},
         {ZE_RESULT_SUCCESS, true, ModuleType::User, 0},
         {ZE_RESULT_SUCCESS, true, ModuleType::Builtin, 1},
@@ -3166,13 +3158,6 @@ TEST_F(ModuleInitializeTest, whenModuleInitializeIsCalledThenCorrectResultIsRetu
         module.translationUnit = std::make_unique<MyMockModuleTU>(device);
         DebugManager.flags.FailBuildProgramWithStatefulAccess.set(debugKey);
         module.setAddressingMode(isStateful);
-
-        if (isStateful && debugKey == -1) {
-            if (compilerProductHelper.failBuildProgramWithStatefulAccessPreference() == true) {
-                expectedResult = ZE_RESULT_ERROR_MODULE_BUILD_FAILURE;
-            }
-        }
-
         EXPECT_EQ(expectedResult, module.initialize(&moduleDesc, device->getNEODevice()));
     }
 }
@@ -3818,8 +3803,6 @@ HWTEST_F(ModuleWithZebinTest, givenZebinWithKernelCallingExternalFunctionThenUpd
 
 using ModuleKernelImmDatasTest = Test<ModuleFixture>;
 TEST_F(ModuleKernelImmDatasTest, givenDeviceOOMWhenMemoryManagerFailsToAllocateMemoryThenReturnInformativeErrorToTheCaller) {
-    DebugManagerStateRestore restore;
-    DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
 
     auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo());
     const auto &src = zebinData->storage;
diff --git a/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp b/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp
index e7b2ee56db..bf300e779d 100644
--- a/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp
+++ b/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp
@@ -24,7 +24,7 @@ class ModuleOnlineCompiled : public DeviceFixture, public testing::Test {
   public:
     void SetUp() override {
         DeviceFixture::setUp();
-        DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
+
         auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo());
         const auto &src = zebinData->storage;
 
@@ -42,7 +42,6 @@ class ModuleOnlineCompiled : public DeviceFixture, public testing::Test {
         DeviceFixture::tearDown();
     }
     std::unique_ptr<WhiteBox<L0::Module>> module;
-    DebugManagerStateRestore restore;
 };
 
 using ModuleTests = Test<DeviceFixture>;
diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp
index 782b95c434..dcdd9a2c5b 100644
--- a/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp
@@ -139,7 +139,6 @@ class UmStatelessCompressionWithStatefulAccess : public ProgramFixture,
     void SetUp() override {
         DebugManager.flags.EnableStatelessCompressionWithUnifiedMemory.set(1);
         DebugManager.flags.EnableSharedSystemUsmSupport.set(0);
-        DebugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
         compareCompressedMemory = GetParam();
 
         ProgramFixture::setUp();
diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp
index ba4b07a836..e7ed7537d2 100644
--- a/opencl/test/unit_test/program/program_tests.cpp
+++ b/opencl/test/unit_test/program/program_tests.cpp
@@ -1898,15 +1898,14 @@ TEST_F(ProgramTests, givenStatefulAndStatelessAccessesWhenProgramBuildIsCalledTh
         }
     };
 
-    std::array<std::tuple<int, bool, int32_t>, 4> testParams = {{{CL_SUCCESS, true, -1},
-                                                                 {CL_SUCCESS, false, -1},
+    std::array<std::tuple<int, bool, int32_t>, 3> testParams = {{{CL_SUCCESS, false, -1},
                                                                  {CL_SUCCESS, true, 0},
                                                                  {CL_BUILD_PROGRAM_FAILURE, true, 1}}};
 
-    for (auto &[expectedResult, isStatefulAccess, debuyKey] : testParams) {
+    for (auto &[result, isStatefulAccess, debuyKey] : testParams) {
 
         if (!compilerProductHelper.isForceToStatelessRequired()) {
-            expectedResult = CL_SUCCESS;
+            result = CL_SUCCESS;
         }
         MyMockProgram program(pContext, false, toClDeviceVector(*pClDevice));
         program.isBuiltIn = false;
@@ -1914,14 +1913,7 @@ TEST_F(ProgramTests, givenStatefulAndStatelessAccessesWhenProgramBuildIsCalledTh
         program.createdFrom = Program::CreatedFrom::SOURCE;
         program.setAddressingMode(isStatefulAccess);
         DebugManager.flags.FailBuildProgramWithStatefulAccess.set(debuyKey);
-
-        if (isStatefulAccess && debuyKey == -1) {
-            if (compilerProductHelper.failBuildProgramWithStatefulAccessPreference() == true) {
-                expectedResult = CL_BUILD_PROGRAM_FAILURE;
-            }
-        }
-
-        EXPECT_EQ(expectedResult, program.build(toClDeviceVector(*pClDevice), nullptr));
+        EXPECT_EQ(result, program.build(toClDeviceVector(*pClDevice), nullptr));
     }
 
     {
diff --git a/shared/source/xe_hpc_core/definitions/compiler_product_helper_pvc.inl b/shared/source/xe_hpc_core/definitions/compiler_product_helper_pvc.inl
index b76476dd85..8469b96bb3 100644
--- a/shared/source/xe_hpc_core/definitions/compiler_product_helper_pvc.inl
+++ b/shared/source/xe_hpc_core/definitions/compiler_product_helper_pvc.inl
@@ -10,10 +10,4 @@ template <>
 uint64_t CompilerProductHelperHw<IGFX_PVC>::getHwInfoConfig(const HardwareInfo &hwInfo) const {
     return 0x0;
 }
-
-template <>
-bool CompilerProductHelperHw<IGFX_PVC>::failBuildProgramWithStatefulAccessPreference() const {
-    return true;
-}
-
 } // namespace NEO