diff --git a/README.md b/README.md
index c174089e9f..e52d38b6b3 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@ You will find the source code here:
 	    |-- wicket-auth-roles
 	    |-- wicket-bean-validation
 	    |-- wicket-cdi
+	    |-- wicket-cdi-tests
 	    |-- wicket-core
 	    |-- wicket-tester
 	    |-- wicket-core-tests
diff --git a/pom.xml b/pom.xml
index dcb64d6388..d75f520f85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,7 @@
 		<module>wicket-extensions</module>
 		<module>wicket-ioc</module>
 		<module>wicket-cdi</module>
+		<module>wicket-cdi-tests</module>
 		<module>wicket-spring</module>
 		<module>wicket-velocity</module>
 		<module>wicket-auth-roles</module>
@@ -572,6 +573,12 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<dependency>
+				<groupId>io.github.cdi-unit</groupId>
+				<artifactId>cdi-unit</artifactId>
+				<version>${cdi-unit.version}</version>
+				<scope>test</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.wicket</groupId>
 				<artifactId>wicket-tester</artifactId>
@@ -637,12 +644,6 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			<dependency>
-				<groupId>io.github.cdi-unit</groupId>
-				<artifactId>cdi-unit</artifactId>
-				<version>${cdi-unit.version}</version>
-				<scope>test</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.junit.jupiter</groupId>
 				<artifactId>junit-jupiter-engine</artifactId>
diff --git a/wicket-cdi-tests/pom.xml b/wicket-cdi-tests/pom.xml
new file mode 100644
index 0000000000..d04b2ac9cf
--- /dev/null
+++ b/wicket-cdi-tests/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.wicket</groupId>
+		<artifactId>wicket-parent</artifactId>
+		<version>10.3.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>wicket-cdi-tests</artifactId>
+	<packaging>jar</packaging>
+	<name>Wicket CDI tests</name>
+	<description>
+		Provides tests for the Wicket and CDI module.
+	</description>
+	<properties>
+		<osgi.export.package>org.apache.wicket.cdi*;-noimport:=true</osgi.export.package>
+		<osgi.import.package>!java*,!kotlin*,!sun.nio.ch,org.slf4j*;version="[1.7,3)",*</osgi.import.package>
+		<maven.deploy.skip>true</maven.deploy.skip>
+		<japicmp.skip>true</japicmp.skip> <!-- this module is not released -->
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.enterprise</groupId>
+			<artifactId>jakarta.enterprise.cdi-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-cdi</artifactId>
+		</dependency>
+		<dependency>
+		  <groupId>io.github.cdi-unit</groupId>
+		  <artifactId>cdi-unit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-tester</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.weld.module</groupId>
+			<artifactId>weld-web</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.weld.se</groupId>
+			<artifactId>weld-se-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+        		<executions>
+          			<execution>
+						<id>test-compile</id>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+						<configuration>
+							<useModulePath>false</useModulePath>
+						</configuration>
+          			</execution>
+       			</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
similarity index 96%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
index 4b73fd8675..201c1c7625 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
+++ b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
@@ -25,7 +25,6 @@
 import org.apache.wicket.cdi.testapp.TestConversationPage;
 import org.apache.wicket.cdi.testapp.TestPage;
 import org.apache.wicket.util.tester.WicketTester;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import io.github.cdiunit.ActivatedAlternatives;
@@ -35,8 +34,6 @@
 /**
  * @author jsarman
  */
-// FIXME Wicket 11. Re-enable once the tests are moved to its own module
-@Disabled
 @ActivatedAlternatives(AlternativeTestAppScope.class)
 class CdiConfigurationTest extends WicketCdiTestCase
 {
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ContextManager.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ContextManager.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/ContextManager.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ContextManager.java
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
similarity index 97%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
index d61cf2d577..3bbc2addca 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
+++ b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
@@ -22,7 +22,6 @@
 import org.apache.wicket.cdi.testapp.TestConversationalPage;
 import org.apache.wicket.core.request.mapper.MountedMapper;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import jakarta.enterprise.context.Conversation;
@@ -31,8 +30,6 @@
 /**
  * @author jsarman
  */
-//FIXME Wicket 11. Re-enable once the tests are moved to its own module
-@Disabled
 class ConversationPropagatorTest extends WicketCdiTestCase
 {
 	@Inject
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/AlternativeTestAppScope.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/AlternativeTestAppScope.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/AlternativeTestAppScope.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/AlternativeTestAppScope.java
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/ModelWithInjectedDependency.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/ModelWithInjectedDependency.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/ModelWithInjectedDependency.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/ModelWithInjectedDependency.java
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.html b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.html
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.html
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.html
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.html b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.html
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.html
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.html
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.java
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java
similarity index 100%
rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java
rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java
diff --git a/wicket-cdi/src/test/java/simplelogger.properties b/wicket-cdi-tests/src/test/java/simplelogger.properties
similarity index 100%
rename from wicket-cdi/src/test/java/simplelogger.properties
rename to wicket-cdi-tests/src/test/java/simplelogger.properties
diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml
index ae40a917cf..cc231ea967 100644
--- a/wicket-cdi/pom.xml
+++ b/wicket-cdi/pom.xml
@@ -37,10 +37,6 @@
 		<osgi.import.package>!java*,!kotlin*,!sun.nio.ch,org.slf4j*;version="[1.7,3)",*</osgi.import.package>
 	</properties>
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.wicket</groupId>
-			<artifactId>wicket-tester</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>jakarta.annotation</groupId>
 			<artifactId>jakarta.annotation-api</artifactId>
@@ -57,21 +53,6 @@
 			<groupId>org.apache.wicket</groupId>
 			<artifactId>wicket-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.jboss.weld.module</groupId>
-			<artifactId>weld-web</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.weld.se</groupId>
-			<artifactId>weld-se-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-		  <groupId>io.github.cdi-unit</groupId>
-		  <artifactId>cdi-unit</artifactId>
-		  <scope>test</scope>
-		</dependency>
 	</dependencies>
 	<build>
 		<pluginManagement>