diff --git a/pom.xml b/pom.xml
index 890755f..6ce930b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ch.sbb.polarion.extensions</groupId>
         <artifactId>ch.sbb.polarion.extension.generic</artifactId>
-        <version>7.3.1</version>
+        <version>7.4.0</version>
     </parent>
 
     <artifactId>ch.sbb.polarion.extension.excel-importer</artifactId>
@@ -75,6 +75,14 @@
             <version>${apache-poi.version}</version>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>ch.sbb.polarion.extensions</groupId>
+            <artifactId>ch.sbb.polarion.extension.generic.app</artifactId>
+            <version>${project.parent.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/test/java/ch/sbb/polarion/extension/excel_importer/settings/ExcelSheetMappingSettingsTest.java b/src/test/java/ch/sbb/polarion/extension/excel_importer/settings/ExcelSheetMappingSettingsTest.java
index e750b17..89a74c7 100644
--- a/src/test/java/ch/sbb/polarion/extension/excel_importer/settings/ExcelSheetMappingSettingsTest.java
+++ b/src/test/java/ch/sbb/polarion/extension/excel_importer/settings/ExcelSheetMappingSettingsTest.java
@@ -1,19 +1,15 @@
 package ch.sbb.polarion.extension.excel_importer.settings;
 
+import ch.sbb.polarion.extension.generic.context.CurrentContextConfig;
+import ch.sbb.polarion.extension.generic.context.CurrentContextExtension;
 import ch.sbb.polarion.extension.generic.exception.ObjectNotFoundException;
-import ch.sbb.polarion.extension.generic.rest.model.Context;
 import ch.sbb.polarion.extension.generic.settings.GenericNamedSettings;
 import ch.sbb.polarion.extension.generic.settings.SettingId;
 import ch.sbb.polarion.extension.generic.settings.SettingsService;
-import ch.sbb.polarion.extension.generic.util.ContextUtils;
 import ch.sbb.polarion.extension.generic.util.ScopeUtils;
 import com.polarion.subterra.base.location.ILocation;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
 import org.mockito.MockedStatic;
 import org.mockito.junit.jupiter.MockitoExtension;
 
@@ -25,23 +21,10 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-@ExtendWith(MockitoExtension.class)
+@ExtendWith({MockitoExtension.class, CurrentContextExtension.class})
+@CurrentContextConfig("excel-importer")
 class ExcelSheetMappingSettingsTest {
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    MockedStatic<ContextUtils> contextUtils;
-
-    @BeforeEach
-    void setUp() {
-        Context context = new Context("excel-importer");
-        contextUtils.when(ContextUtils::getContext).thenReturn(context);
-    }
-
-    @AfterEach
-    void tearDown() {
-        contextUtils.close();
-    }
-
     @Test
     void testSettingDoesNotExist() {
         try (MockedStatic<ScopeUtils> mockScopeUtils = mockStatic(ScopeUtils.class)) {