diff --git a/unit_tests/aub_tests/gen10/execution_model/enqueue_parent_kernel_tests_gen10.cpp b/unit_tests/aub_tests/gen10/execution_model/enqueue_parent_kernel_tests_gen10.cpp
index 59dc25b7bb..e6f532b70c 100644
--- a/unit_tests/aub_tests/gen10/execution_model/enqueue_parent_kernel_tests_gen10.cpp
+++ b/unit_tests/aub_tests/gen10/execution_model/enqueue_parent_kernel_tests_gen10.cpp
@@ -101,11 +101,7 @@ GEN10TEST_F(GEN10AUBParentKernelFixture, DISABLED_EnqueueParentKernel) {
         pCmdQ->finish(false);
 
         uint32_t expectedNumberOfEnqueues = 1;
-        IGIL_CommandQueue *igilQueue = reinterpret_cast<IGIL_CommandQueue *>(devQueue->getQueueBuffer()->getUnderlyingBuffer());
-        uint64_t gpuAddress = devQueue->getQueueBuffer()->getGpuAddress();
-        uint32_t *pointerTonumberOfEnqueues = &igilQueue->m_controls.m_TotalNumberOfQueues;
-        size_t offsetToEnqueues = ptrDiff(pointerTonumberOfEnqueues, igilQueue);
-        gpuAddress = gpuAddress + offsetToEnqueues;
+        uint64_t gpuAddress = devQueue->getQueueBuffer()->getGpuAddress() + offsetof(IGIL_CommandQueue, m_controls.m_TotalNumberOfQueues);
 
         AUBCommandStreamFixture::expectMemory<FamilyType>((void *)(uintptr_t)gpuAddress, &expectedNumberOfEnqueues, sizeof(uint32_t));
         AUBCommandStreamFixture::expectMemory<FamilyType>((void *)(uintptr_t)buffer->getGraphicsAllocation()->getGpuAddress(), &argScalar, sizeof(size_t));
diff --git a/unit_tests/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp b/unit_tests/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp
index 0d4f3a033d..f8ed0dde56 100644
--- a/unit_tests/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp
+++ b/unit_tests/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp
@@ -101,11 +101,7 @@ GEN11TEST_F(GEN11AUBParentKernelFixture, EnqueueParentKernel) {
         pCmdQ->finish(false);
 
         uint32_t expectedNumberOfEnqueues = 1;
-        IGIL_CommandQueue *igilQueue = reinterpret_cast<IGIL_CommandQueue *>(devQueue->getQueueBuffer()->getUnderlyingBuffer());
-        uint64_t gpuAddress = devQueue->getQueueBuffer()->getGpuAddress();
-        uint32_t *pointerTonumberOfEnqueues = &igilQueue->m_controls.m_TotalNumberOfQueues;
-        size_t offsetToEnqueues = ptrDiff(pointerTonumberOfEnqueues, igilQueue);
-        gpuAddress = gpuAddress + offsetToEnqueues;
+        uint64_t gpuAddress = devQueue->getQueueBuffer()->getGpuAddress() + offsetof(IGIL_CommandQueue, m_controls.m_TotalNumberOfQueues);
 
         AUBCommandStreamFixture::expectMemory<FamilyType>((void *)(uintptr_t)gpuAddress, &expectedNumberOfEnqueues, sizeof(uint32_t));
         AUBCommandStreamFixture::expectMemory<FamilyType>((void *)(uintptr_t)buffer->getGraphicsAllocation()->getGpuAddress(), &argScalar, sizeof(size_t));
diff --git a/unit_tests/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp b/unit_tests/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp
index ae7a7a78b9..8fa0c1010f 100644
--- a/unit_tests/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp
+++ b/unit_tests/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp
@@ -101,11 +101,7 @@ GEN8TEST_F(GEN8AUBParentKernelFixture, EnqueueParentKernel) {
         pCmdQ->finish(false);
 
         uint32_t expectedNumberOfEnqueues = 1;
-        IGIL_CommandQueue *igilQueue = reinterpret_cast<IGIL_CommandQueue *>(devQueue->getQueueBuffer()->getUnderlyingBuffer());
-        uint64_t gpuAddress = devQueue->getQueueBuffer()->getGpuAddress();
-        uint32_t *pointerTonumberOfEnqueues = &igilQueue->m_controls.m_TotalNumberOfQueues;
-        size_t offsetToEnqueues = ptrDiff(pointerTonumberOfEnqueues, igilQueue);
-        gpuAddress = gpuAddress + offsetToEnqueues;
+        uint64_t gpuAddress = devQueue->getQueueBuffer()->getGpuAddress() + offsetof(IGIL_CommandQueue, m_controls.m_TotalNumberOfQueues);
 
         AUBCommandStreamFixture::expectMemory<FamilyType>((void *)(uintptr_t)gpuAddress, &expectedNumberOfEnqueues, sizeof(uint32_t));
         AUBCommandStreamFixture::expectMemory<FamilyType>((void *)(uintptr_t)buffer->getGraphicsAllocation()->getGpuAddress(), &argScalar, sizeof(size_t));
diff --git a/unit_tests/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp b/unit_tests/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp
index 2f4afd7ad7..5e42d68a39 100644
--- a/unit_tests/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp
+++ b/unit_tests/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp
@@ -99,11 +99,7 @@ GEN9TEST_F(AUBParentKernelFixture, EnqueueParentKernel) {
         pCmdQ->finish(false);
 
         uint32_t expectedNumberOfEnqueues = 1;
-        IGIL_CommandQueue *igilQueue = reinterpret_cast<IGIL_CommandQueue *>(devQueue->getQueueBuffer()->getUnderlyingBuffer());
-        uint64_t gpuAddress = devQueue->getQueueBuffer()->getGpuAddress();
-        uint32_t *pointerTonumberOfEnqueues = &igilQueue->m_controls.m_TotalNumberOfQueues;
-        size_t offsetToEnqueues = ptrDiff(pointerTonumberOfEnqueues, igilQueue);
-        gpuAddress = gpuAddress + offsetToEnqueues;
+        uint64_t gpuAddress = devQueue->getQueueBuffer()->getGpuAddress() + offsetof(IGIL_CommandQueue, m_controls.m_TotalNumberOfQueues);
 
         AUBCommandStreamFixture::expectMemory<FamilyType>((void *)(uintptr_t)gpuAddress, &expectedNumberOfEnqueues, sizeof(uint32_t));
         AUBCommandStreamFixture::expectMemory<FamilyType>((void *)(uintptr_t)buffer->getGraphicsAllocation()->getGpuAddress(), &argScalar, sizeof(size_t));