diff --git a/celements-calendar-gdata/pom.xml b/celements-calendar-gdata/pom.xml
index fee616de..25cb48c1 100644
--- a/celements-calendar-gdata/pom.xml
+++ b/celements-calendar-gdata/pom.xml
@@ -144,11 +144,6 @@
       <artifactId>celements-subsystem-migration-manager</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-calendar</artifactId>
diff --git a/celements-captcha/pom.xml b/celements-captcha/pom.xml
index 2bb3b733..ac59ef87 100644
--- a/celements-captcha/pom.xml
+++ b/celements-captcha/pom.xml
@@ -146,11 +146,6 @@
       <artifactId>celements-subsystem-migration-manager</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
diff --git a/celements-cleverreach/pom.xml b/celements-cleverreach/pom.xml
index ffbd51ca..3c4a7a6d 100644
--- a/celements-cleverreach/pom.xml
+++ b/celements-cleverreach/pom.xml
@@ -138,11 +138,6 @@
       <artifactId>celements-subsystem-migration-manager</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
diff --git a/celements-contact/pom.xml b/celements-contact/pom.xml
index a116c145..cfc77485 100644
--- a/celements-contact/pom.xml
+++ b/celements-contact/pom.xml
@@ -138,11 +138,6 @@
       <artifactId>celements-subsystem-migration-manager</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
diff --git a/celements-css/pom.xml b/celements-css/pom.xml
index e7e59cd9..f5194220 100644
--- a/celements-css/pom.xml
+++ b/celements-css/pom.xml
@@ -146,11 +146,6 @@
       <artifactId>celements-subsystem-migration-manager</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
diff --git a/celements-layout/component/pom.xml b/celements-layout/component/pom.xml
index b1ea8ce0..79269f80 100644
--- a/celements-layout/component/pom.xml
+++ b/celements-layout/component/pom.xml
@@ -138,11 +138,6 @@
       <artifactId>celements-subsystem-migration-manager</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-core</artifactId>
diff --git a/celements-mailsender/pom.xml b/celements-mailsender/pom.xml
index e52ea2a6..d1dae4d5 100644
--- a/celements-mailsender/pom.xml
+++ b/celements-mailsender/pom.xml
@@ -143,11 +143,6 @@
       <groupId>com.sun.mail</groupId>
       <artifactId>jakarta.mail</artifactId>
     </dependency>
-    <dependency>
-      <groupId>jmock</groupId>
-      <artifactId>jmock-cglib</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jvnet.mock-javamail</groupId>
       <artifactId>mock-javamail</artifactId>
@@ -174,11 +169,6 @@
       <artifactId>xwiki-core-script</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <scm>
     <connection>scm:git:git@github.com:celements/celements-features.git</connection>
diff --git a/celements-mailsender/src/test/java/com/xpn/xwiki/plugin/mailsender/MailSenderApiTest.java b/celements-mailsender/src/test/java/com/xpn/xwiki/plugin/mailsender/MailSenderApiTest.java
index 72303f7a..ae878a16 100644
--- a/celements-mailsender/src/test/java/com/xpn/xwiki/plugin/mailsender/MailSenderApiTest.java
+++ b/celements-mailsender/src/test/java/com/xpn/xwiki/plugin/mailsender/MailSenderApiTest.java
@@ -31,26 +31,15 @@
 import org.jvnet.mock_javamail.Mailbox;
 
 import com.xpn.xwiki.doc.XWikiDocument;
-import com.xpn.xwiki.test.AbstractBridgedXWikiComponentTestCase;
 **/
 
-import org.jmock.Mock;
-
-import com.xpn.xwiki.XWiki;
-
 /**
  * Integration tests for {@link com.xpn.xwiki.plugin.mailsender.Mail}. The tests start a SMTP
  * server.
  */
-// public class MailSenderApiTest extends AbstractBridgedXWikiComponentTestCase {
+// public class MailSenderApiTest {
 public class MailSenderApiTest {
 
-  private Mock mockXWiki;
-
-  private XWiki xwiki;
-
-  private MailSenderPluginApi api;
-
   /*
    * @Override
    * protected void setUp() throws Exception {
diff --git a/celements-payment/pom.xml b/celements-payment/pom.xml
index 05873eb8..d0de4480 100644
--- a/celements-payment/pom.xml
+++ b/celements-payment/pom.xml
@@ -138,11 +138,6 @@
       <artifactId>celements-subsystem-migration-manager</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
diff --git a/celements-rights/pom.xml b/celements-rights/pom.xml
index 21567427..da35995f 100644
--- a/celements-rights/pom.xml
+++ b/celements-rights/pom.xml
@@ -138,11 +138,6 @@
       <artifactId>celements-subsystem-migration-manager</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
diff --git a/celements-scheduler/pom.xml b/celements-scheduler/pom.xml
index 2eef3d01..bdf54ab8 100644
--- a/celements-scheduler/pom.xml
+++ b/celements-scheduler/pom.xml
@@ -128,11 +128,6 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
diff --git a/celements-search/pom.xml b/celements-search/pom.xml
index 303103cf..653cd8f8 100644
--- a/celements-search/pom.xml
+++ b/celements-search/pom.xml
@@ -146,11 +146,6 @@
       <artifactId>celements-subsystem-migration-manager</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
diff --git a/celements-tag/pom.xml b/celements-tag/pom.xml
index 9505a141..13f4f195 100644
--- a/celements-tag/pom.xml
+++ b/celements-tag/pom.xml
@@ -143,11 +143,6 @@
       <artifactId>celements-scheduler</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-xwiki-core</artifactId>
diff --git a/celements-user-manager/component/pom.xml b/celements-user-manager/component/pom.xml
index 9330e68c..41b39a8e 100644
--- a/celements-user-manager/component/pom.xml
+++ b/celements-user-manager/component/pom.xml
@@ -133,11 +133,6 @@
       <artifactId>celements-shared-tests</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
diff --git a/celements-webdav/pom.xml b/celements-webdav/pom.xml
index ba0b5307..ab49e6c5 100644
--- a/celements-webdav/pom.xml
+++ b/celements-webdav/pom.xml
@@ -133,11 +133,6 @@
       <artifactId>celements-subsystem-migration-manager</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-common</artifactId>