diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp
index 74c457eb81..7516ec259a 100644
--- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp
+++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp
@@ -57,8 +57,16 @@ TEST_F(L0DebuggerTest, givenL0DebuggerWhenGettingSipAllocationThenValidSipTypeIs
 }
 
 TEST_F(L0DebuggerTest, givenL0DebuggerWhenGettingSipTypeThenDebugBindlessIsReturned) {
+    auto &compilerProductHelper = neoDevice->getCompilerProductHelper();
+    auto heaplessEnabled = compilerProductHelper.isHeaplessModeEnabled();
+
     auto sipType = SipKernel::getSipKernelType(*neoDevice);
-    EXPECT_EQ(NEO::SipKernelType::dbgBindless, sipType);
+    if (heaplessEnabled) {
+        EXPECT_EQ(NEO::SipKernelType::dbgHeapless, sipType);
+
+    } else {
+        EXPECT_EQ(NEO::SipKernelType::dbgBindless, sipType);
+    }
 }
 
 TEST_F(L0DebuggerTest, givenL0DebuggerWhenGettingStateSaveAreaHeaderThenValidSipTypeIsReturned) {
diff --git a/shared/test/unit_test/built_ins/sip_tests.cpp b/shared/test/unit_test/built_ins/sip_tests.cpp
index 9bd0a67191..2e61e1ad65 100644
--- a/shared/test/unit_test/built_ins/sip_tests.cpp
+++ b/shared/test/unit_test/built_ins/sip_tests.cpp
@@ -435,7 +435,14 @@ TEST(DebugBindlessSip, givenDebuggerAndUseBindlessDebugSipWhenGettingSipTypeThen
 
     auto sipType = NEO::SipKernel::getSipKernelType(*mockDevice);
 
-    EXPECT_EQ(SipKernelType::dbgBindless, sipType);
+    auto &compilerProductHelper = mockDevice->getCompilerProductHelper();
+    auto heaplessEnabled = compilerProductHelper.isHeaplessModeEnabled();
+    if (heaplessEnabled) {
+        EXPECT_EQ(SipKernelType::dbgHeapless, sipType);
+
+    } else {
+        EXPECT_EQ(SipKernelType::dbgBindless, sipType);
+    }
 }
 
 TEST(DebugHeaplessSip, givenDebuggerAndUseHeaplessModeWhenGettingSipTypeThenDebugHeaplessTypeIsReturned) {