diff --git a/shared/source/xe2_hpg_core/definitions/gfx_core_helper_xe2_hpg_core_additional.inl b/shared/source/xe2_hpg_core/definitions/gfx_core_helper_xe2_hpg_core_additional.inl
deleted file mode 100644
index 4fa4901f25..0000000000
--- a/shared/source/xe2_hpg_core/definitions/gfx_core_helper_xe2_hpg_core_additional.inl
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * Copyright (C) 2024 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
diff --git a/shared/source/xe2_hpg_core/gfx_core_helper_xe2_hpg_core.cpp b/shared/source/xe2_hpg_core/gfx_core_helper_xe2_hpg_core.cpp
index 2e4878a497..e028235306 100644
--- a/shared/source/xe2_hpg_core/gfx_core_helper_xe2_hpg_core.cpp
+++ b/shared/source/xe2_hpg_core/gfx_core_helper_xe2_hpg_core.cpp
@@ -24,8 +24,6 @@ using Family = NEO::Xe2HpgCoreFamily;
 #include "shared/source/helpers/simd_helper.h"
 #include "shared/source/release_helper/release_helper.h"
 
-#include "gfx_core_helper_xe2_hpg_core_additional.inl"
-
 namespace NEO {
 
 template <>
diff --git a/shared/test/common/common_main.cpp b/shared/test/common/common_main.cpp
index a6da283c3d..bc68660034 100644
--- a/shared/test/common/common_main.cpp
+++ b/shared/test/common/common_main.cpp
@@ -433,6 +433,7 @@ int main(int argc, char **argv) {
             MockSipData::mockSipKernel.reset(new MockSipKernel());
             if (testMode == TestMode::aubTests || testMode == TestMode::aubTestsWithTbx) {
                 MockSipData::useMockSip = false;
+                debugManager.flags.OverrideCsrAllocationSize.set(1);
             } else {
                 MockSipData::useMockSip = true;
             }