diff --git a/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp
index 7ad97ad20d..c9adbbe554 100644
--- a/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp
@@ -43,11 +43,15 @@ struct DrmCommandStreamMultiTileMemExecFixture {
         executionEnvironment->initGmm();
 
         mock = DrmMockCustom::create(*executionEnvironment->rootDeviceEnvironments[0]).release();
+        mock->completionFenceSupported = true;
+        mock->isVmBindAvailableCall.callParent = false;
+        mock->isVmBindAvailableCall.returnValue = true;
+
         executionEnvironment->rootDeviceEnvironments[0]->osInterface = std::make_unique<OSInterface>();
         executionEnvironment->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::unique_ptr<DriverModel>(mock));
         executionEnvironment->rootDeviceEnvironments[0]->memoryOperationsInterface = DrmMemoryOperationsHandler::create(*mock, 0, false);
 
-        memoryManager = new DrmMemoryManager(GemCloseWorkerMode::gemCloseWorkerActive,
+        memoryManager = new DrmMemoryManager(GemCloseWorkerMode::gemCloseWorkerInactive,
                                              debugManager.flags.EnableForcePin.get(),
                                              true,
                                              *executionEnvironment);
@@ -55,20 +59,13 @@ struct DrmCommandStreamMultiTileMemExecFixture {
         executionEnvironment->prepareRootDeviceEnvironments(1u);
         executionEnvironment->rootDeviceEnvironments[0]->setHwInfoAndInitHelpers(NEO::defaultHwInfo.get());
 
-        auto &compilerProductHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper<CompilerProductHelper>();
-        auto heapless = compilerProductHelper.isHeaplessModeEnabled();
-        auto heaplessStateInit = compilerProductHelper.isHeaplessStateInitEnabled(heapless);
-
-        if (heaplessStateInit) {
-            GTEST_SKIP();
-        }
-
         UnitTestSetter::setCcsExposure(*executionEnvironment->rootDeviceEnvironments[0]);
         UnitTestSetter::setRcsExposure(*executionEnvironment->rootDeviceEnvironments[0]);
         executionEnvironment->calculateMaxOsContextCount();
 
         executionEnvironment->initializeMemoryManager();
 
+        VariableBackup<bool> backupSipData(&MockSipData::useMockSip, false);
         VariableBackup<UltHwConfig> backup(&ultHwConfig);
         ultHwConfig.useHwCsr = true;
         device.reset(MockDevice::create<MockDevice>(executionEnvironment, 0));
@@ -93,10 +90,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, DrmCommandStreamMultiTileMemExecTest, GivenDrmSuppo
     device->resetCommandStreamReceiver(testCsr);
     EXPECT_EQ(2u, testCsr->activePartitions);
 
-    mock->completionFenceSupported = true;
-    mock->isVmBindAvailableCall.callParent = false;
-    mock->isVmBindAvailableCall.returnValue = true;
-
     TestedBufferObject bo(0, mock, 128);
     MockDrmAllocation cmdBuffer(0u, AllocationType::commandBuffer, MemoryPool::system4KBPages);
     cmdBuffer.bufferObjects[0] = &bo;
@@ -135,18 +128,10 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, DrmCommandStreamMultiTileMemExecTest, GivenDrmSuppo
     uint32_t postSyncOffset = defaultEngine.commandStreamReceiver->getImmWritePostSyncWriteOffset();
     EXPECT_NE(0u, postSyncOffset);
 
-    mock->completionFenceSupported = true;
-    mock->isVmBindAvailableCall.callParent = false;
-    mock->isVmBindAvailableCall.returnValue = true;
-
     auto &compilerProductHelper = device->getCompilerProductHelper();
     auto heapless = compilerProductHelper.isHeaplessModeEnabled();
     auto heaplessStateInit = compilerProductHelper.isHeaplessStateInitEnabled(heapless);
 
-    if (heaplessStateInit) {
-        GTEST_SKIP();
-    }
-
     auto allocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{0, 1024, AllocationType::commandBuffer});
     allocation->updateTaskCount(heaplessStateInit ? 3 : 2, defaultEngine.osContext->getContextId());
 
@@ -178,18 +163,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, DrmCommandStreamMultiTileMemExecTest, GivenDrmSuppo
     uint32_t postSyncOffset = defaultEngine.commandStreamReceiver->getImmWritePostSyncWriteOffset();
     EXPECT_NE(0u, postSyncOffset);
 
-    mock->completionFenceSupported = true;
-    mock->isVmBindAvailableCall.callParent = false;
-    mock->isVmBindAvailableCall.returnValue = true;
-
-    auto &compilerProductHelper = device->getCompilerProductHelper();
-    auto heapless = compilerProductHelper.isHeaplessModeEnabled();
-    auto heaplessStateInit = compilerProductHelper.isHeaplessStateInitEnabled(heapless);
-
-    if (heaplessStateInit) {
-        GTEST_SKIP();
-    }
-
     auto allocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{0, 1024, AllocationType::commandBuffer});
     allocation->updateTaskCount(2, defaultEngine.osContext->getContextId());