diff --git a/shared/test/common/os_interface/linux/xe/mock_drm_xe.inl b/shared/test/common/os_interface/linux/xe/mock_drm_xe.inl
index 1e2a6f7466..237af07ab5 100644
--- a/shared/test/common/os_interface/linux/xe/mock_drm_xe.inl
+++ b/shared/test/common/os_interface/linux/xe/mock_drm_xe.inl
@@ -32,7 +32,7 @@ struct DrmMockXe : public DrmMockCustom {
     const uint16_t devId = 0xabc;
 
     uint64_t queryConfig[7]{}; // 1 qword for num params and 1 qwords per param
-    static constexpr uint32_t mockExecQueueId = 1234;
+    uint32_t mockExecQueueId = 1234;
     static constexpr int32_t mockMaxExecQueuePriority = 3;
     static constexpr int32_t mockDefaultCxlType = 0;
     static constexpr uint32_t mockTimestampFrequency = 12500000;
diff --git a/shared/test/common/os_interface/linux/xe/mock_drm_xe_definitions.inl b/shared/test/common/os_interface/linux/xe/mock_drm_xe_definitions.inl
index cf34f9e5bd..d771d7949c 100644
--- a/shared/test/common/os_interface/linux/xe/mock_drm_xe_definitions.inl
+++ b/shared/test/common/os_interface/linux/xe/mock_drm_xe_definitions.inl
@@ -170,14 +170,11 @@ int DrmMockXe::ioctl(DrmIoctl request, void *arg) {
             handleContextCreateExtensions(ext);
             extension = ext->next_extension;
         }
-        queueCreate->exec_queue_id = mockExecQueueId;
+        queueCreate->exec_queue_id = ++mockExecQueueId;
         ret = 0;
     } break;
     case DrmIoctl::gemContextDestroy: {
-        auto queueDestroy = static_cast<drm_xe_exec_queue_destroy *>(arg);
-        if (queueDestroy->exec_queue_id == mockExecQueueId) {
-            ret = 0;
-        }
+        ret = 0;
     } break;
     case DrmIoctl::perfOpen: {
         ret = 0;