diff --git a/tmail-backend/integration-tests/jmap/jmap-integration-tests-common/src/main/scala/com/linagora/tmail/james/common/MemoryLinagoraContactSupportCapabilityContract.scala b/tmail-backend/integration-tests/jmap/jmap-integration-tests-common/src/main/scala/com/linagora/tmail/james/common/LinagoraContactSupportCapabilityContract.scala
similarity index 97%
rename from tmail-backend/integration-tests/jmap/jmap-integration-tests-common/src/main/scala/com/linagora/tmail/james/common/MemoryLinagoraContactSupportCapabilityContract.scala
rename to tmail-backend/integration-tests/jmap/jmap-integration-tests-common/src/main/scala/com/linagora/tmail/james/common/LinagoraContactSupportCapabilityContract.scala
index c4c7428e70..d3a1935a9b 100644
--- a/tmail-backend/integration-tests/jmap/jmap-integration-tests-common/src/main/scala/com/linagora/tmail/james/common/MemoryLinagoraContactSupportCapabilityContract.scala
+++ b/tmail-backend/integration-tests/jmap/jmap-integration-tests-common/src/main/scala/com/linagora/tmail/james/common/LinagoraContactSupportCapabilityContract.scala
@@ -11,7 +11,7 @@ import org.apache.james.utils.DataProbeImpl
 import org.hamcrest.Matchers.{equalTo, hasKey}
 import org.junit.jupiter.api.{BeforeEach, Test}
 
-object MemoryLinagoraContactSupportCapabilityContract {
+object LinagoraContactSupportCapabilityContract {
   trait MailAddressConfigured {
     @BeforeEach
     def setUp(server: GuiceJamesServer): Unit = {
diff --git a/tmail-backend/integration-tests/jmap/memory-jmap-integration-tests/src/test/java/com/linagora/tmail/james/MemoryLinagoraContactSupportCapabilityTest.java b/tmail-backend/integration-tests/jmap/memory-jmap-integration-tests/src/test/java/com/linagora/tmail/james/MemoryLinagoraContactSupportCapabilityTest.java
index 691f576b39..0c4b693a71 100644
--- a/tmail-backend/integration-tests/jmap/memory-jmap-integration-tests/src/test/java/com/linagora/tmail/james/MemoryLinagoraContactSupportCapabilityTest.java
+++ b/tmail-backend/integration-tests/jmap/memory-jmap-integration-tests/src/test/java/com/linagora/tmail/james/MemoryLinagoraContactSupportCapabilityTest.java
@@ -4,18 +4,20 @@
 
 import org.apache.james.JamesServerBuilder;
 import org.apache.james.JamesServerExtension;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import com.linagora.tmail.james.app.MemoryConfiguration;
 import com.linagora.tmail.james.app.MemoryServer;
-import com.linagora.tmail.james.common.MemoryLinagoraContactSupportCapabilityContract;
+import com.linagora.tmail.james.common.LinagoraContactSupportCapabilityContract;
 import com.linagora.tmail.james.jmap.JMAPExtensionConfiguration;
 import com.linagora.tmail.james.jmap.firebase.FirebaseModuleChooserConfiguration;
 import com.linagora.tmail.module.LinagoraTestJMAPServerModule;
 
 public class MemoryLinagoraContactSupportCapabilityTest {
-    public static class MailAddressConfiguredTest
-        implements MemoryLinagoraContactSupportCapabilityContract.MailAddressConfigured {
+    @Nested
+    class MailAddressConfiguredTest
+        implements LinagoraContactSupportCapabilityContract.MailAddressConfigured {
         @RegisterExtension
         static JamesServerExtension
             jamesServerExtension = new JamesServerBuilder<MemoryConfiguration>(tmpDir ->
@@ -30,8 +32,9 @@ public static class MailAddressConfiguredTest
             .build();
     }
 
-    public static class MailAddressNotConfiguredTest
-        implements MemoryLinagoraContactSupportCapabilityContract.MailAddressNotConfigured {
+    @Nested
+    class MailAddressNotConfiguredTest
+        implements LinagoraContactSupportCapabilityContract.MailAddressNotConfigured {
         @RegisterExtension
         static JamesServerExtension
             jamesServerExtension = new JamesServerBuilder<MemoryConfiguration>(tmpDir ->