diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java
index 59993129d..cde9b34c4 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java
@@ -43,8 +43,9 @@ public class DossierTemplateImportTest extends AbstractPersistenceServerServiceT
 
     @SneakyThrows
     @Test
+    // For local testing, so disabled for CI
     @Disabled
-    public void testDossierTemplateImport() {
+    public void testLocalDossierTemplateImport() {
 
         var importDir = new File("/Users/timobejan/work/dossier-templates-v2/dev");
         assertThat(importDir).isNotNull();
@@ -55,13 +56,7 @@ public class DossierTemplateImportTest extends AbstractPersistenceServerServiceT
             if (file.isDirectory()) {
                 var archive = pack(file.getAbsolutePath());
                 log.info("Importing file: " + file.getName() + " " + " with size: " + archive.length);
-                var request = new ImportDossierTemplateRequest();
-                request.setArchive(archive);
-                request.setUpdateExistingDossierTemplate(false);
-                request.setUserId("system");
-                DossierTemplate dossierTemplate = dossierTemplateManagementService.importDossierTemplate(request);
-                assertThat(dossierTemplate).isNotNull();
-                assertThat(dossierTemplate.getId()).isNotBlank();
+                testDossierTemplateImport(archive);
             }
         }
     }
@@ -93,12 +88,47 @@ public class DossierTemplateImportTest extends AbstractPersistenceServerServiceT
     }
 
 
+    @SneakyThrows
+    @Test
+    public void testDossierTemplateImport() {
+
+        TenantContext.setTenantId("redaction");
+
+        var archive = loadFileFromClasspath("EFSA_sanitisation_GFL_v1.zip");
+        testDossierTemplateImport(archive);
+    }
+
+
+    @SneakyThrows
+    private byte[] loadFileFromClasspath(String filename) {
+
+        ClassPathResource classPathResource = new ClassPathResource(DOSSIERTEMPLATES_PATH + filename);
+        assertThat(classPathResource.exists()).isTrue();
+        try (InputStream inputStream = classPathResource.getInputStream()) {
+            return inputStream.readAllBytes();
+        }
+    }
+
+
+    private void testDossierTemplateImport(byte[] archive) {
+
+        var request = new ImportDossierTemplateRequest();
+        request.setArchive(archive);
+        request.setUpdateExistingDossierTemplate(false);
+        request.setUserId("system");
+        DossierTemplate dossierTemplate = dossierTemplateManagementService.importDossierTemplate(request);
+        assertThat(dossierTemplate).isNotNull();
+        assertThat(dossierTemplate.getId()).isNotBlank();
+    }
+
+
     @Test
     @SneakyThrows
+    // This is currently not working, since there seems to be some missing Feign decoder config for tests
     @Disabled
     public void dossierImportClientTest() {
 
-        var multipartFile = loadDossierTemplateFromClasspath("EFSA_sanitisation_GFL_v1.zip");
+        var multipartFile = loadMultiPartFileFromClasspath("EFSA_sanitisation_GFL_v1.zip");
         DossierTemplateModel dossierTemplateModel = dossierTemplateClient.importDossierTemplate(multipartFile, null, false);
         assertThat(dossierTemplateModel).isNotNull();
         assertThat(dossierTemplateModel.getId()).isNotBlank();
@@ -107,7 +137,7 @@ public class DossierTemplateImportTest extends AbstractPersistenceServerServiceT
 
 
     @SneakyThrows
-    private MockMultipartFile loadDossierTemplateFromClasspath(String filename) {
+    private MockMultipartFile loadMultiPartFileFromClasspath(String filename) {
 
         ClassPathResource classPathResource = new ClassPathResource(DOSSIERTEMPLATES_PATH + filename);
         assertThat(classPathResource.exists()).isTrue();
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/resources/files/dossiertemplates/EFSA_sanitisation_GFL_v1.zip b/persistence-service-v1/persistence-service-server-v1/src/test/resources/files/dossiertemplates/EFSA_sanitisation_GFL_v1.zip
index 79b0004eb..1346866d7 100644
Binary files a/persistence-service-v1/persistence-service-server-v1/src/test/resources/files/dossiertemplates/EFSA_sanitisation_GFL_v1.zip and b/persistence-service-v1/persistence-service-server-v1/src/test/resources/files/dossiertemplates/EFSA_sanitisation_GFL_v1.zip differ