diff --git a/components/camel-activemq/pom.xml b/components/camel-activemq/pom.xml
index 4746a5b24977f..44d8bebc4f957 100644
--- a/components/camel-activemq/pom.xml
+++ b/components/camel-activemq/pom.xml
@@ -59,7 +59,12 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
-
+       <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-artemis</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-artemis</artifactId>
@@ -67,7 +72,6 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
-
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-messaging-common</artifactId>
diff --git a/components/camel-activemq6/pom.xml b/components/camel-activemq6/pom.xml
index 657752ea5029b..2a98204a30470 100644
--- a/components/camel-activemq6/pom.xml
+++ b/components/camel-activemq6/pom.xml
@@ -52,7 +52,7 @@
             <version>${activemq6-version}</version>
         </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-core</artifactId>
             <version>${project.version}</version>
@@ -60,7 +60,13 @@
             <type>test-jar</type>
         </dependency>
 
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-artemis</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-artemis</artifactId>
             <version>${project.version}</version>
@@ -68,7 +74,7 @@
             <type>test-jar</type>
         </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-messaging-common</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-ai/camel-chatscript/pom.xml b/components/camel-ai/camel-chatscript/pom.xml
index aa10630c45e60..1f1e5ca044c53 100644
--- a/components/camel-ai/camel-chatscript/pom.xml
+++ b/components/camel-ai/camel-chatscript/pom.xml
@@ -55,9 +55,14 @@
             <scope>test</scope>
         </dependency>
 
-
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-chatscript</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-chatscript</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-ai/camel-kserve/pom.xml b/components/camel-ai/camel-kserve/pom.xml
index 9733c21a54c84..d50af4fec7878 100644
--- a/components/camel-ai/camel-kserve/pom.xml
+++ b/components/camel-ai/camel-kserve/pom.xml
@@ -87,6 +87,12 @@
         </dependency>
 
         <!-- test infra -->
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-triton</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-triton</artifactId>
diff --git a/components/camel-ai/camel-langchain4j-chat/pom.xml b/components/camel-ai/camel-langchain4j-chat/pom.xml
index fa07dd6fab2d4..9bdbd19ec7d20 100644
--- a/components/camel-ai/camel-langchain4j-chat/pom.xml
+++ b/components/camel-ai/camel-langchain4j-chat/pom.xml
@@ -66,6 +66,12 @@
             <version>${langchain4j-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-ollama</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-ollama</artifactId>
diff --git a/components/camel-ai/camel-langchain4j-embeddings/pom.xml b/components/camel-ai/camel-langchain4j-embeddings/pom.xml
index bf9620d895eee..cfb00a6e50e29 100644
--- a/components/camel-ai/camel-langchain4j-embeddings/pom.xml
+++ b/components/camel-ai/camel-langchain4j-embeddings/pom.xml
@@ -108,6 +108,12 @@
         </dependency>
 
         <!-- test infra -->
+       <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-qdrant</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-qdrant</artifactId>
@@ -115,6 +121,12 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+       <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-milvus</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-milvus</artifactId>
@@ -122,6 +134,12 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-neo4j</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-neo4j</artifactId>
diff --git a/components/camel-ai/camel-milvus/pom.xml b/components/camel-ai/camel-milvus/pom.xml
index 0cad304f3bbcf..5eb8f9ff0a5df 100644
--- a/components/camel-ai/camel-milvus/pom.xml
+++ b/components/camel-ai/camel-milvus/pom.xml
@@ -122,7 +122,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-milvus</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-milvus</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-ai/camel-neo4j/pom.xml b/components/camel-ai/camel-neo4j/pom.xml
index 2ece9d75b1392..94016624ee45a 100644
--- a/components/camel-ai/camel-neo4j/pom.xml
+++ b/components/camel-ai/camel-neo4j/pom.xml
@@ -83,6 +83,12 @@
     </dependency>
 
     <!-- test infra -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test-infra-neo4j</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test-infra-neo4j</artifactId>
diff --git a/components/camel-ai/camel-qdrant/pom.xml b/components/camel-ai/camel-qdrant/pom.xml
index a9dbad0bb7470..195977f35b52c 100644
--- a/components/camel-ai/camel-qdrant/pom.xml
+++ b/components/camel-ai/camel-qdrant/pom.xml
@@ -134,7 +134,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-qdrant</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-qdrant</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-ai/camel-tensorflow-serving/pom.xml b/components/camel-ai/camel-tensorflow-serving/pom.xml
index eab953ff74023..7520cfe005e8b 100644
--- a/components/camel-ai/camel-tensorflow-serving/pom.xml
+++ b/components/camel-ai/camel-tensorflow-serving/pom.xml
@@ -88,6 +88,12 @@
         </dependency>
 
         <!-- test infra -->
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-tensorflow-serving</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-tensorflow-serving</artifactId>
diff --git a/components/camel-ai/camel-torchserve/pom.xml b/components/camel-ai/camel-torchserve/pom.xml
index 61e71d79aa172..6cd6f416cef89 100644
--- a/components/camel-ai/camel-torchserve/pom.xml
+++ b/components/camel-ai/camel-torchserve/pom.xml
@@ -104,7 +104,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-torchserve</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-torchserve</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 0467ab4036479..9bb77b5541c21 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -76,7 +76,7 @@
 
         <!-- testing -->
         <!-- test infra -->
-       <dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-core</artifactId>
             <version>${project.version}</version>
@@ -84,7 +84,13 @@
             <type>test-jar</type>
         </dependency>
 
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-artemis</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-artemis</artifactId>
             <version>${project.version}</version>
@@ -98,7 +104,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
diff --git a/components/camel-arangodb/pom.xml b/components/camel-arangodb/pom.xml
index f5832e65be340..b43a8332c8093 100644
--- a/components/camel-arangodb/pom.xml
+++ b/components/camel-arangodb/pom.xml
@@ -75,9 +75,15 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-arangodb</artifactId>
             <version>${project.version}</version>
-            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-arangodb</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
     </dependencies>
 
 
diff --git a/components/camel-aws/camel-aws-bedrock/pom.xml b/components/camel-aws/camel-aws-bedrock/pom.xml
index 47dc8ce8348ea..c1f0487bb594b 100644
--- a/components/camel-aws/camel-aws-bedrock/pom.xml
+++ b/components/camel-aws/camel-aws-bedrock/pom.xml
@@ -87,7 +87,13 @@
             <scope>test</scope>
         </dependency>
 
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws-cloudtrail/pom.xml b/components/camel-aws/camel-aws-cloudtrail/pom.xml
index fa47b73346eb0..c22ca7b3d059c 100644
--- a/components/camel-aws/camel-aws-cloudtrail/pom.xml
+++ b/components/camel-aws/camel-aws-cloudtrail/pom.xml
@@ -63,7 +63,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws-config/pom.xml b/components/camel-aws/camel-aws-config/pom.xml
index eff3f7a1a5c36..6bacae214f03e 100644
--- a/components/camel-aws/camel-aws-config/pom.xml
+++ b/components/camel-aws/camel-aws-config/pom.xml
@@ -63,7 +63,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws-secrets-manager/pom.xml b/components/camel-aws/camel-aws-secrets-manager/pom.xml
index 61e4c5352623b..108f3fb8fd536 100644
--- a/components/camel-aws/camel-aws-secrets-manager/pom.xml
+++ b/components/camel-aws/camel-aws-secrets-manager/pom.xml
@@ -83,7 +83,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-athena/pom.xml b/components/camel-aws/camel-aws2-athena/pom.xml
index 816a1a1d1bfcf..c0d83906de118 100644
--- a/components/camel-aws/camel-aws2-athena/pom.xml
+++ b/components/camel-aws/camel-aws2-athena/pom.xml
@@ -70,7 +70,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-cw/pom.xml b/components/camel-aws/camel-aws2-cw/pom.xml
index b7e7b5c7faf25..5150ebfd9a4a3 100644
--- a/components/camel-aws/camel-aws2-cw/pom.xml
+++ b/components/camel-aws/camel-aws2-cw/pom.xml
@@ -63,7 +63,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-ddb/pom.xml b/components/camel-aws/camel-aws2-ddb/pom.xml
index 07514ade8c84a..cfc40b7b55db3 100644
--- a/components/camel-aws/camel-aws2-ddb/pom.xml
+++ b/components/camel-aws/camel-aws2-ddb/pom.xml
@@ -86,7 +86,13 @@
             <scope>test</scope>
         </dependency>
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-ec2/pom.xml b/components/camel-aws/camel-aws2-ec2/pom.xml
index 02454fcc42f8a..d2d00be8febc2 100644
--- a/components/camel-aws/camel-aws2-ec2/pom.xml
+++ b/components/camel-aws/camel-aws2-ec2/pom.xml
@@ -62,7 +62,13 @@
             <scope>test</scope>
         </dependency>
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-eks/pom.xml b/components/camel-aws/camel-aws2-eks/pom.xml
index d79c1c3e10995..7bd1a12e6f4b1 100644
--- a/components/camel-aws/camel-aws2-eks/pom.xml
+++ b/components/camel-aws/camel-aws2-eks/pom.xml
@@ -63,6 +63,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
diff --git a/components/camel-aws/camel-aws2-eventbridge/pom.xml b/components/camel-aws/camel-aws2-eventbridge/pom.xml
index 05bea79002cd0..ecfc3feb54b95 100644
--- a/components/camel-aws/camel-aws2-eventbridge/pom.xml
+++ b/components/camel-aws/camel-aws2-eventbridge/pom.xml
@@ -77,7 +77,13 @@
             <scope>test</scope>
         </dependency>
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-iam/pom.xml b/components/camel-aws/camel-aws2-iam/pom.xml
index a095e5c486455..d08cf5ed90f4c 100644
--- a/components/camel-aws/camel-aws2-iam/pom.xml
+++ b/components/camel-aws/camel-aws2-iam/pom.xml
@@ -62,7 +62,13 @@
             <scope>test</scope>
         </dependency>
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-kinesis/pom.xml b/components/camel-aws/camel-aws2-kinesis/pom.xml
index 78c231f04d115..1dce3a290efe9 100644
--- a/components/camel-aws/camel-aws2-kinesis/pom.xml
+++ b/components/camel-aws/camel-aws2-kinesis/pom.xml
@@ -92,7 +92,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-kms/pom.xml b/components/camel-aws/camel-aws2-kms/pom.xml
index 0a0112bf6c5d2..1b57e723ba216 100644
--- a/components/camel-aws/camel-aws2-kms/pom.xml
+++ b/components/camel-aws/camel-aws2-kms/pom.xml
@@ -66,7 +66,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-lambda/pom.xml b/components/camel-aws/camel-aws2-lambda/pom.xml
index a142a42ea7cf8..9f8b238b5bb3e 100644
--- a/components/camel-aws/camel-aws2-lambda/pom.xml
+++ b/components/camel-aws/camel-aws2-lambda/pom.xml
@@ -65,7 +65,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-mq/pom.xml b/components/camel-aws/camel-aws2-mq/pom.xml
index 69a4b4abcc0b0..0987f645e1d5c 100644
--- a/components/camel-aws/camel-aws2-mq/pom.xml
+++ b/components/camel-aws/camel-aws2-mq/pom.xml
@@ -61,7 +61,13 @@
             <artifactId>camel-test-spring-junit5</artifactId>
             <scope>test</scope>
         </dependency>
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-msk/pom.xml b/components/camel-aws/camel-aws2-msk/pom.xml
index 1dcf07c8e6fb3..f773f7213aa48 100644
--- a/components/camel-aws/camel-aws2-msk/pom.xml
+++ b/components/camel-aws/camel-aws2-msk/pom.xml
@@ -56,7 +56,13 @@
             <artifactId>camel-health</artifactId>
         </dependency>
         <!-- test infra -->
-       <dependency>
+        <dependency>
+          <groupId>org.apache.camel</groupId>
+          <artifactId>camel-test-infra-aws-v2</artifactId>
+          <version>${project.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-s3/pom.xml b/components/camel-aws/camel-aws2-s3/pom.xml
index 6fc439b3aaf8a..f622c5626b043 100644
--- a/components/camel-aws/camel-aws2-s3/pom.xml
+++ b/components/camel-aws/camel-aws2-s3/pom.xml
@@ -73,7 +73,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-ses/pom.xml b/components/camel-aws/camel-aws2-ses/pom.xml
index 669639a78d189..33e93b104e908 100644
--- a/components/camel-aws/camel-aws2-ses/pom.xml
+++ b/components/camel-aws/camel-aws2-ses/pom.xml
@@ -61,7 +61,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-sns/pom.xml b/components/camel-aws/camel-aws2-sns/pom.xml
index 395eea9c2f8ac..9b11cd18ef3ec 100644
--- a/components/camel-aws/camel-aws2-sns/pom.xml
+++ b/components/camel-aws/camel-aws2-sns/pom.xml
@@ -68,7 +68,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-sqs/pom.xml b/components/camel-aws/camel-aws2-sqs/pom.xml
index dff6a80c22b5b..6ef50d36c2996 100644
--- a/components/camel-aws/camel-aws2-sqs/pom.xml
+++ b/components/camel-aws/camel-aws2-sqs/pom.xml
@@ -61,7 +61,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-step-functions/pom.xml b/components/camel-aws/camel-aws2-step-functions/pom.xml
index b25e83905eb79..22fca2713d196 100644
--- a/components/camel-aws/camel-aws2-step-functions/pom.xml
+++ b/components/camel-aws/camel-aws2-step-functions/pom.xml
@@ -64,7 +64,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-sts/pom.xml b/components/camel-aws/camel-aws2-sts/pom.xml
index b1fe5f4430c56..b967c2b21ac06 100644
--- a/components/camel-aws/camel-aws2-sts/pom.xml
+++ b/components/camel-aws/camel-aws2-sts/pom.xml
@@ -64,7 +64,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-timestream/pom.xml b/components/camel-aws/camel-aws2-timestream/pom.xml
index 44163e2a4d0f2..8a95428143548 100644
--- a/components/camel-aws/camel-aws2-timestream/pom.xml
+++ b/components/camel-aws/camel-aws2-timestream/pom.xml
@@ -69,7 +69,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-aws/camel-aws2-translate/pom.xml b/components/camel-aws/camel-aws2-translate/pom.xml
index af5d50dc01d78..37756bd94ef49 100644
--- a/components/camel-aws/camel-aws2-translate/pom.xml
+++ b/components/camel-aws/camel-aws2-translate/pom.xml
@@ -63,7 +63,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-v2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml b/components/camel-azure/camel-azure-storage-blob/pom.xml
index fc62a3f38c386..a97fdb27b4f69 100644
--- a/components/camel-azure/camel-azure-storage-blob/pom.xml
+++ b/components/camel-azure/camel-azure-storage-blob/pom.xml
@@ -100,7 +100,13 @@
             <scope>test</scope>
         </dependency>
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-azure-storage-blob</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-azure-storage-blob</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-azure/camel-azure-storage-datalake/pom.xml b/components/camel-azure/camel-azure-storage-datalake/pom.xml
index 7ff40c06b62bb..bf18dc4cd260b 100644
--- a/components/camel-azure/camel-azure-storage-datalake/pom.xml
+++ b/components/camel-azure/camel-azure-storage-datalake/pom.xml
@@ -52,7 +52,7 @@
             <artifactId>commons-io</artifactId>
             <version>${commons-io-version}</version>
         </dependency>
-        
+
         <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
@@ -75,7 +75,13 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-azure-storage-datalake</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-azure-storage-datalake</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-azure/camel-azure-storage-queue/pom.xml b/components/camel-azure/camel-azure-storage-queue/pom.xml
index 3125aa42fcca6..8671565cefefb 100644
--- a/components/camel-azure/camel-azure-storage-queue/pom.xml
+++ b/components/camel-azure/camel-azure-storage-queue/pom.xml
@@ -96,7 +96,13 @@
             <scope>test</scope>
         </dependency>
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-azure-storage-queue</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-azure-storage-queue</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-cassandraql/pom.xml b/components/camel-cassandraql/pom.xml
index 6848be259208b..c29c06bb47586 100644
--- a/components/camel-cassandraql/pom.xml
+++ b/components/camel-cassandraql/pom.xml
@@ -95,6 +95,12 @@
             <scope>test</scope>
         </dependency>
 
+       <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-cassandra</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-cassandra</artifactId>
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index e6ab2c0214352..9365772b4c83c 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -145,9 +145,15 @@
             <artifactId>camel-spring-main</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-consul</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-consul</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-couchbase/pom.xml b/components/camel-couchbase/pom.xml
index 601d17728b4a3..5297c81b7cd63 100644
--- a/components/camel-couchbase/pom.xml
+++ b/components/camel-couchbase/pom.xml
@@ -63,7 +63,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-couchbase</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-couchbase</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml
index 95fbd746c67db..3048fa5f6d5f1 100644
--- a/components/camel-couchdb/pom.xml
+++ b/components/camel-couchdb/pom.xml
@@ -69,7 +69,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-couchdb</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-couchdb</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-cxf/camel-cxf-spring-soap/pom.xml b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
index e7a170129a3bc..95095a55b376b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
@@ -97,7 +97,13 @@
         </dependency>
 
         <!-- test for the cxf jms transport -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-artemis</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-artemis</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-dynamic-router/pom.xml b/components/camel-dynamic-router/pom.xml
index 144f33c9c178c..f4704297749c9 100644
--- a/components/camel-dynamic-router/pom.xml
+++ b/components/camel-dynamic-router/pom.xml
@@ -50,12 +50,12 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test-infra-core</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
-       <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-core</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test-infra-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
diff --git a/components/camel-elasticsearch-rest-client/pom.xml b/components/camel-elasticsearch-rest-client/pom.xml
index 1e2f27eac6776..06d8cdb4deeb7 100644
--- a/components/camel-elasticsearch-rest-client/pom.xml
+++ b/components/camel-elasticsearch-rest-client/pom.xml
@@ -77,12 +77,12 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test-infra-elasticsearch</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
-       <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-elasticsearch</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test-infra-elasticsearch</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/components/camel-elasticsearch/pom.xml b/components/camel-elasticsearch/pom.xml
index 70793c922b615..70f215f950d78 100644
--- a/components/camel-elasticsearch/pom.xml
+++ b/components/camel-elasticsearch/pom.xml
@@ -73,7 +73,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-elasticsearch</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-elasticsearch</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-etcd3/pom.xml b/components/camel-etcd3/pom.xml
index 77031b5c5a95f..82f0192898a2b 100644
--- a/components/camel-etcd3/pom.xml
+++ b/components/camel-etcd3/pom.xml
@@ -87,7 +87,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-etcd3</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-etcd3</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-fhir/camel-fhir-component/pom.xml b/components/camel-fhir/camel-fhir-component/pom.xml
index 0b6b6377d6c76..13ec7b1ebd9f9 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -168,7 +168,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-fhir</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-fhir</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index b2b35044da009..f12a5203f54fb 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -153,7 +153,13 @@
 
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-ftp</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-ftp</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-google/camel-google-pubsub/pom.xml b/components/camel-google/camel-google-pubsub/pom.xml
index 2f993bd3f6c5b..4702406a6de0a 100644
--- a/components/camel-google/camel-google-pubsub/pom.xml
+++ b/components/camel-google/camel-google-pubsub/pom.xml
@@ -76,7 +76,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-google-pubsub</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-google-pubsub</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-hashicorp-vault/pom.xml b/components/camel-hashicorp-vault/pom.xml
index 93aeb027c0248..96a612606b164 100644
--- a/components/camel-hashicorp-vault/pom.xml
+++ b/components/camel-hashicorp-vault/pom.xml
@@ -55,7 +55,13 @@
             <artifactId>camel-test-junit5</artifactId>
             <scope>test</scope>
         </dependency>
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-hashicorp-vault</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-hashicorp-vault</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml
index bfa29d127507a..1c144788e2d51 100644
--- a/components/camel-hazelcast/pom.xml
+++ b/components/camel-hazelcast/pom.xml
@@ -73,7 +73,13 @@
             <artifactId>camel-spring-main</artifactId>
             <scope>test</scope>
         </dependency>
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-hazelcast</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-hazelcast</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index ea8edce381d3c..7c1065f0b033f 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -87,6 +87,11 @@
             <artifactId>camel-test-infra-ignite</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
+        </dependency><dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-ignite</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
             <type>test-jar</type>
         </dependency>
     </dependencies>
diff --git a/components/camel-infinispan/camel-infinispan/pom.xml b/components/camel-infinispan/camel-infinispan/pom.xml
index 6e1fd97d9fdee..37ce395f2ac3a 100644
--- a/components/camel-infinispan/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/camel-infinispan/pom.xml
@@ -90,7 +90,13 @@
             <scope>test</scope>
         </dependency>
 
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-infinispan</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-infinispan</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 0542938c77043..952555ef698b6 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -118,7 +118,13 @@
             <type>test-jar</type>
         </dependency>
 
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-artemis</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-artemis</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 85c2d82f5b57a..db26b80a5c3a9 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -75,7 +75,13 @@
             <type>test-jar</type>
         </dependency>
 
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-kafka</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-kafka</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-ldif/pom.xml b/components/camel-ldif/pom.xml
index cefa3455fdb7f..bfbbe45fda837 100644
--- a/components/camel-ldif/pom.xml
+++ b/components/camel-ldif/pom.xml
@@ -87,7 +87,13 @@
             <scope>test</scope>
         </dependency>
 
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-openldap</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-openldap</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-lra/pom.xml b/components/camel-lra/pom.xml
index 78f94129216ef..0e3671ba65113 100644
--- a/components/camel-lra/pom.xml
+++ b/components/camel-lra/pom.xml
@@ -76,7 +76,13 @@
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-microprofile-lra</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-microprofile-lra</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-minio/pom.xml b/components/camel-minio/pom.xml
index 40dec56051471..5d5c39a045888 100644
--- a/components/camel-minio/pom.xml
+++ b/components/camel-minio/pom.xml
@@ -80,7 +80,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-minio</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-minio</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml
index 47b96312a36ca..d8396e7becc58 100644
--- a/components/camel-mllp/pom.xml
+++ b/components/camel-mllp/pom.xml
@@ -76,7 +76,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-artemis</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-artemis</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml
index 2e3bd429357ac..da07e12547797 100644
--- a/components/camel-mongodb/pom.xml
+++ b/components/camel-mongodb/pom.xml
@@ -74,7 +74,13 @@
             <scope>test</scope>
         </dependency>
 
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-mongodb</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-mongodb</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-nats/pom.xml b/components/camel-nats/pom.xml
index bb70d2dca3ea7..d2456542fd87b 100644
--- a/components/camel-nats/pom.xml
+++ b/components/camel-nats/pom.xml
@@ -54,7 +54,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-nats</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-nats</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-opensearch/pom.xml b/components/camel-opensearch/pom.xml
index 238f375c20312..693a85298c4b5 100644
--- a/components/camel-opensearch/pom.xml
+++ b/components/camel-opensearch/pom.xml
@@ -85,7 +85,13 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-opensearch</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-opensearch</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-paho-mqtt5/pom.xml b/components/camel-paho-mqtt5/pom.xml
index c351919e7fd10..7966f719a3690 100644
--- a/components/camel-paho-mqtt5/pom.xml
+++ b/components/camel-paho-mqtt5/pom.xml
@@ -54,7 +54,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-mosquitto</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-mosquitto</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-paho/pom.xml b/components/camel-paho/pom.xml
index 2de914628308b..0e7f880ba03d7 100644
--- a/components/camel-paho/pom.xml
+++ b/components/camel-paho/pom.xml
@@ -65,7 +65,13 @@
             <version>${activemq-artemis-version}</version>
             <scope>test</scope>
         </dependency>
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-artemis</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-artemis</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-pg-replication-slot/pom.xml b/components/camel-pg-replication-slot/pom.xml
index 844995b40d58f..2a2c134db4080 100644
--- a/components/camel-pg-replication-slot/pom.xml
+++ b/components/camel-pg-replication-slot/pom.xml
@@ -60,7 +60,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-postgres</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-postgres</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-platform-http/pom.xml b/components/camel-platform-http/pom.xml
index 759dadfe7bdc7..61c44d9546fe7 100644
--- a/components/camel-platform-http/pom.xml
+++ b/components/camel-platform-http/pom.xml
@@ -43,13 +43,19 @@
         </dependency>
 
         <!-- test infra -->
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-jetty</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
-       </dependency>
-       <dependency>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-jetty</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-pulsar/pom.xml b/components/camel-pulsar/pom.xml
index 2daca8991e84c..a5e78bed8b29d 100644
--- a/components/camel-pulsar/pom.xml
+++ b/components/camel-pulsar/pom.xml
@@ -76,7 +76,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-pulsar</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+    	</dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-pulsar</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-redis/pom.xml b/components/camel-redis/pom.xml
index 6629a68d5c688..6fac1822ee864 100644
--- a/components/camel-redis/pom.xml
+++ b/components/camel-redis/pom.xml
@@ -59,7 +59,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-redis</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-redis</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-rocketmq/pom.xml b/components/camel-rocketmq/pom.xml
index 4f48b7d4a7995..ea534fa593596 100644
--- a/components/camel-rocketmq/pom.xml
+++ b/components/camel-rocketmq/pom.xml
@@ -68,7 +68,12 @@
             <scope>test</scope>
         </dependency>
 
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-rocketmq</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency><dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-rocketmq</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index 5809ef154d23b..a79c8bc3188d3 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -61,7 +61,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-artemis</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-artemis</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml
index ad6ec496c44b0..feb22fd036b28 100644
--- a/components/camel-sjms2/pom.xml
+++ b/components/camel-sjms2/pom.xml
@@ -59,7 +59,13 @@
             <artifactId>camel-test-junit5</artifactId>
             <scope>test</scope>
         </dependency>
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-artemis</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-artemis</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-smb/pom.xml b/components/camel-smb/pom.xml
index 3ec9ac944e7cc..8fcc98a0a9639 100644
--- a/components/camel-smb/pom.xml
+++ b/components/camel-smb/pom.xml
@@ -67,6 +67,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test-infra-smb</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test-infra-smb</artifactId>
diff --git a/components/camel-spring-rabbitmq/pom.xml b/components/camel-spring-rabbitmq/pom.xml
index 53e5fa037d9e2..95bfebc5a4a7e 100644
--- a/components/camel-spring-rabbitmq/pom.xml
+++ b/components/camel-spring-rabbitmq/pom.xml
@@ -45,7 +45,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-rabbitmq</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-rabbitmq</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-stomp/pom.xml b/components/camel-stomp/pom.xml
index 4e72efa2fc6c9..aa6971528813b 100644
--- a/components/camel-stomp/pom.xml
+++ b/components/camel-stomp/pom.xml
@@ -59,7 +59,13 @@
             <version>${activemq-artemis-version}</version>
             <scope>test</scope>
         </dependency>
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-artemis</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-artemis</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-tahu/pom.xml b/components/camel-tahu/pom.xml
index a8c7160234249..e851177fa6771 100644
--- a/components/camel-tahu/pom.xml
+++ b/components/camel-tahu/pom.xml
@@ -185,6 +185,12 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
+       <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-hivemq</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-hivemq</artifactId>
@@ -218,4 +224,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
index 82679675d2c7d..96ce63b14b2a0 100644
--- a/components/camel-xmpp/pom.xml
+++ b/components/camel-xmpp/pom.xml
@@ -91,6 +91,12 @@
 
         <!-- test infra -->
        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-xmpp</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-xmpp</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index 76758ffc54493..5e32c580fc0fc 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -109,7 +109,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-zookeeper</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-zookeeper</artifactId>
             <version>${project.version}</version>
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index 597185f5baf39..3473ab8ebea0a 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -161,7 +161,13 @@
         </dependency>
 
         <!-- test infra -->
-       <dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-zookeeper</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-zookeeper</artifactId>
             <version>${project.version}</version>
diff --git a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml
index 84cefc7ef5246..ecfae32987801 100644
--- a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml
@@ -84,7 +84,6 @@
             <artifactId>camel-test-infra-common</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
-            <type>test-jar</type>
         </dependency>
 
         <dependency>
diff --git a/test-infra/camel-test-infra-arangodb/pom.xml b/test-infra/camel-test-infra-arangodb/pom.xml
index e55746956ab32..dd1bfd31e0678 100644
--- a/test-infra/camel-test-infra-arangodb/pom.xml
+++ b/test-infra/camel-test-infra-arangodb/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-artemis/pom.xml b/test-infra/camel-test-infra-artemis/pom.xml
index 06eb29fef40a2..3aeb9e721f98f 100644
--- a/test-infra/camel-test-infra-artemis/pom.xml
+++ b/test-infra/camel-test-infra-artemis/pom.xml
@@ -39,14 +39,11 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
             <version>${project.version}</version>
-            <type>test-jar</type>
         </dependency>
-
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-messaging-common</artifactId>
             <version>${project.version}</version>
-            <type>test-jar</type>
         </dependency>
 
         <dependency>
diff --git a/test-infra/camel-test-infra-aws-common/pom.xml b/test-infra/camel-test-infra-aws-common/pom.xml
index 8b29a394c317b..c54c55ad6b00d 100644
--- a/test-infra/camel-test-infra-aws-common/pom.xml
+++ b/test-infra/camel-test-infra-aws-common/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
@@ -48,4 +53,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/test-infra/camel-test-infra-aws-v2/pom.xml b/test-infra/camel-test-infra-aws-v2/pom.xml
index 2fd4787f83cce..cebb7dada7226 100644
--- a/test-infra/camel-test-infra-aws-v2/pom.xml
+++ b/test-infra/camel-test-infra-aws-v2/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-aws-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-common</artifactId>
diff --git a/test-infra/camel-test-infra-azure-common/pom.xml b/test-infra/camel-test-infra-azure-common/pom.xml
index 631c38f981a33..7cde2234442ba 100644
--- a/test-infra/camel-test-infra-azure-common/pom.xml
+++ b/test-infra/camel-test-infra-azure-common/pom.xml
@@ -34,6 +34,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
@@ -47,4 +52,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/test-infra/camel-test-infra-azure-storage-blob/pom.xml b/test-infra/camel-test-infra-azure-storage-blob/pom.xml
index a0b634d5fdaa7..f467bd9af94b2 100644
--- a/test-infra/camel-test-infra-azure-storage-blob/pom.xml
+++ b/test-infra/camel-test-infra-azure-storage-blob/pom.xml
@@ -46,6 +46,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-azure-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-azure-common</artifactId>
diff --git a/test-infra/camel-test-infra-azure-storage-datalake/pom.xml b/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
index a2c56e625f680..d23c9913818f2 100644
--- a/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
+++ b/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
@@ -46,6 +46,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-azure-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-azure-common</artifactId>
diff --git a/test-infra/camel-test-infra-azure-storage-queue/pom.xml b/test-infra/camel-test-infra-azure-storage-queue/pom.xml
index 3b9ab0324c5bd..ad6e49944d63c 100644
--- a/test-infra/camel-test-infra-azure-storage-queue/pom.xml
+++ b/test-infra/camel-test-infra-azure-storage-queue/pom.xml
@@ -46,6 +46,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-azure-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-azure-common</artifactId>
diff --git a/test-infra/camel-test-infra-cassandra/pom.xml b/test-infra/camel-test-infra-cassandra/pom.xml
index bfab27d02ec83..e8931388ee15a 100644
--- a/test-infra/camel-test-infra-cassandra/pom.xml
+++ b/test-infra/camel-test-infra-cassandra/pom.xml
@@ -34,6 +34,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-chatscript/pom.xml b/test-infra/camel-test-infra-chatscript/pom.xml
index 1cfd9a1db2bb1..55b0afb2a02f6 100644
--- a/test-infra/camel-test-infra-chatscript/pom.xml
+++ b/test-infra/camel-test-infra-chatscript/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-cli/pom.xml b/test-infra/camel-test-infra-cli/pom.xml
index 18ef3dfcf6a7a..435ebb65383da 100644
--- a/test-infra/camel-test-infra-cli/pom.xml
+++ b/test-infra/camel-test-infra-cli/pom.xml
@@ -24,29 +24,29 @@
         <relativePath>../camel-test-infra-parent/pom.xml</relativePath>
         <version>4.10.0-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <artifactId>camel-test-infra-cli</artifactId>
     <name>Camel :: Test Infra :: Cli (Camel JBang)</name>
 
     <properties>
         <maven.test.skip>false</maven.test.skip>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
             <version>${project.version}</version>
-            <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
             <version>${project.version}</version>
+            <type>test-jar</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
diff --git a/test-infra/camel-test-infra-consul/pom.xml b/test-infra/camel-test-infra-consul/pom.xml
index 1277ad605e44b..08a6e1fcb1ba1 100644
--- a/test-infra/camel-test-infra-consul/pom.xml
+++ b/test-infra/camel-test-infra-consul/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-couchbase/pom.xml b/test-infra/camel-test-infra-couchbase/pom.xml
index 9448af968b903..5ffb6f8bacbb0 100644
--- a/test-infra/camel-test-infra-couchbase/pom.xml
+++ b/test-infra/camel-test-infra-couchbase/pom.xml
@@ -34,6 +34,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-couchdb/pom.xml b/test-infra/camel-test-infra-couchdb/pom.xml
index fa2fc8ff81c76..430978512e548 100644
--- a/test-infra/camel-test-infra-couchdb/pom.xml
+++ b/test-infra/camel-test-infra-couchdb/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-elasticsearch/pom.xml b/test-infra/camel-test-infra-elasticsearch/pom.xml
index 218d23974d8a6..e240faddbf7a3 100644
--- a/test-infra/camel-test-infra-elasticsearch/pom.xml
+++ b/test-infra/camel-test-infra-elasticsearch/pom.xml
@@ -34,6 +34,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
@@ -54,5 +59,4 @@
         </dependency>
     </dependencies>
 
-
 </project>
diff --git a/test-infra/camel-test-infra-etcd3/pom.xml b/test-infra/camel-test-infra-etcd3/pom.xml
index c035abdc10d42..fa6bfcfade10a 100644
--- a/test-infra/camel-test-infra-etcd3/pom.xml
+++ b/test-infra/camel-test-infra-etcd3/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-fhir/pom.xml b/test-infra/camel-test-infra-fhir/pom.xml
index 72ea50fad5b50..c7099052a746e 100644
--- a/test-infra/camel-test-infra-fhir/pom.xml
+++ b/test-infra/camel-test-infra-fhir/pom.xml
@@ -36,6 +36,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-ftp/pom.xml b/test-infra/camel-test-infra-ftp/pom.xml
index 647ecc4692d05..925812526df35 100644
--- a/test-infra/camel-test-infra-ftp/pom.xml
+++ b/test-infra/camel-test-infra-ftp/pom.xml
@@ -60,6 +60,11 @@
             <version>${sshd-version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-google-pubsub/pom.xml b/test-infra/camel-test-infra-google-pubsub/pom.xml
index db8b671cbff7e..b1a4bf8cd2326 100644
--- a/test-infra/camel-test-infra-google-pubsub/pom.xml
+++ b/test-infra/camel-test-infra-google-pubsub/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-hashicorp-vault/pom.xml b/test-infra/camel-test-infra-hashicorp-vault/pom.xml
index 92d5e70956d9a..ed451453cf121 100644
--- a/test-infra/camel-test-infra-hashicorp-vault/pom.xml
+++ b/test-infra/camel-test-infra-hashicorp-vault/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-hazelcast/pom.xml b/test-infra/camel-test-infra-hazelcast/pom.xml
index 2064b15f13528..5dee4c7365c1f 100644
--- a/test-infra/camel-test-infra-hazelcast/pom.xml
+++ b/test-infra/camel-test-infra-hazelcast/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-hivemq/pom.xml b/test-infra/camel-test-infra-hivemq/pom.xml
index b2a2bf22f71e4..78b71ac38a374 100644
--- a/test-infra/camel-test-infra-hivemq/pom.xml
+++ b/test-infra/camel-test-infra-hivemq/pom.xml
@@ -36,6 +36,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-ignite/pom.xml b/test-infra/camel-test-infra-ignite/pom.xml
index 114eca220ddf2..d745af55ef311 100644
--- a/test-infra/camel-test-infra-ignite/pom.xml
+++ b/test-infra/camel-test-infra-ignite/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-infinispan/pom.xml b/test-infra/camel-test-infra-infinispan/pom.xml
index 94fede6461570..79418ac2b82ce 100644
--- a/test-infra/camel-test-infra-infinispan/pom.xml
+++ b/test-infra/camel-test-infra-infinispan/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-jdbc/pom.xml b/test-infra/camel-test-infra-jdbc/pom.xml
index 3070b21abb6f2..fc36c532fdaa3 100644
--- a/test-infra/camel-test-infra-jdbc/pom.xml
+++ b/test-infra/camel-test-infra-jdbc/pom.xml
@@ -30,6 +30,11 @@
     <name>Camel :: Test Infra :: JDBC</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-jetty/pom.xml b/test-infra/camel-test-infra-jetty/pom.xml
index 0fa3816112168..ef37b3b9e65ac 100644
--- a/test-infra/camel-test-infra-jetty/pom.xml
+++ b/test-infra/camel-test-infra-jetty/pom.xml
@@ -31,6 +31,11 @@
     <name>Camel :: Test Infra :: Jetty</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
@@ -79,5 +84,4 @@
         </dependency>
     </dependencies>
 
-
 </project>
diff --git a/test-infra/camel-test-infra-kafka/pom.xml b/test-infra/camel-test-infra-kafka/pom.xml
index dcca8f8a03db6..cd8d36491395b 100644
--- a/test-infra/camel-test-infra-kafka/pom.xml
+++ b/test-infra/camel-test-infra-kafka/pom.xml
@@ -36,6 +36,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-messaging-common/pom.xml b/test-infra/camel-test-infra-messaging-common/pom.xml
index 7290b8ed325dd..1e1a3af486b7a 100644
--- a/test-infra/camel-test-infra-messaging-common/pom.xml
+++ b/test-infra/camel-test-infra-messaging-common/pom.xml
@@ -34,6 +34,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-microprofile-lra/pom.xml b/test-infra/camel-test-infra-microprofile-lra/pom.xml
index e9da70cf4659b..02c1917e02a3a 100644
--- a/test-infra/camel-test-infra-microprofile-lra/pom.xml
+++ b/test-infra/camel-test-infra-microprofile-lra/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-milvus/pom.xml b/test-infra/camel-test-infra-milvus/pom.xml
index 82bff5351b1a8..31f0b397f7469 100644
--- a/test-infra/camel-test-infra-milvus/pom.xml
+++ b/test-infra/camel-test-infra-milvus/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-minio/pom.xml b/test-infra/camel-test-infra-minio/pom.xml
index e7d73d0ec385d..9f03b03e2c766 100644
--- a/test-infra/camel-test-infra-minio/pom.xml
+++ b/test-infra/camel-test-infra-minio/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-mongodb/pom.xml b/test-infra/camel-test-infra-mongodb/pom.xml
index 4f853d5fa4bb2..ab3bc92bbc677 100644
--- a/test-infra/camel-test-infra-mongodb/pom.xml
+++ b/test-infra/camel-test-infra-mongodb/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-mosquitto/pom.xml b/test-infra/camel-test-infra-mosquitto/pom.xml
index d3a3659259bc5..87a6491e1b7c6 100644
--- a/test-infra/camel-test-infra-mosquitto/pom.xml
+++ b/test-infra/camel-test-infra-mosquitto/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-nats/pom.xml b/test-infra/camel-test-infra-nats/pom.xml
index 615be8367be47..8093964202bcf 100644
--- a/test-infra/camel-test-infra-nats/pom.xml
+++ b/test-infra/camel-test-infra-nats/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-neo4j/pom.xml b/test-infra/camel-test-infra-neo4j/pom.xml
index 71e3d66c96f00..73b046f8f986e 100644
--- a/test-infra/camel-test-infra-neo4j/pom.xml
+++ b/test-infra/camel-test-infra-neo4j/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-ollama/pom.xml b/test-infra/camel-test-infra-ollama/pom.xml
index 9256185ce8dc1..1f6265539a2d9 100644
--- a/test-infra/camel-test-infra-ollama/pom.xml
+++ b/test-infra/camel-test-infra-ollama/pom.xml
@@ -35,19 +35,24 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
         </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
             <version>${testcontainers-version}</version>
         </dependency>
 
-
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>ollama</artifactId>
@@ -55,4 +60,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/test-infra/camel-test-infra-openldap/pom.xml b/test-infra/camel-test-infra-openldap/pom.xml
index 7c59b76f1b4c6..d43662f928842 100644
--- a/test-infra/camel-test-infra-openldap/pom.xml
+++ b/test-infra/camel-test-infra-openldap/pom.xml
@@ -34,6 +34,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-opensearch/pom.xml b/test-infra/camel-test-infra-opensearch/pom.xml
index 80ec53e36f3e8..da477b78c81de 100644
--- a/test-infra/camel-test-infra-opensearch/pom.xml
+++ b/test-infra/camel-test-infra-opensearch/pom.xml
@@ -34,6 +34,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-postgres/pom.xml b/test-infra/camel-test-infra-postgres/pom.xml
index 5c8f14981a374..525336baa1e5d 100644
--- a/test-infra/camel-test-infra-postgres/pom.xml
+++ b/test-infra/camel-test-infra-postgres/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-pulsar/pom.xml b/test-infra/camel-test-infra-pulsar/pom.xml
index a74e7e2279f61..472fb321686ac 100644
--- a/test-infra/camel-test-infra-pulsar/pom.xml
+++ b/test-infra/camel-test-infra-pulsar/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-qdrant/pom.xml b/test-infra/camel-test-infra-qdrant/pom.xml
index 75ce6f440d617..bb2645ddca003 100644
--- a/test-infra/camel-test-infra-qdrant/pom.xml
+++ b/test-infra/camel-test-infra-qdrant/pom.xml
@@ -36,6 +36,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-rabbitmq/pom.xml b/test-infra/camel-test-infra-rabbitmq/pom.xml
index e6255b76b319e..02619a7743421 100644
--- a/test-infra/camel-test-infra-rabbitmq/pom.xml
+++ b/test-infra/camel-test-infra-rabbitmq/pom.xml
@@ -34,6 +34,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-redis/pom.xml b/test-infra/camel-test-infra-redis/pom.xml
index f43381a1402b8..48213baa3331f 100644
--- a/test-infra/camel-test-infra-redis/pom.xml
+++ b/test-infra/camel-test-infra-redis/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-rocketmq/pom.xml b/test-infra/camel-test-infra-rocketmq/pom.xml
index e08fb2ba1da81..b8ed1f54c3216 100644
--- a/test-infra/camel-test-infra-rocketmq/pom.xml
+++ b/test-infra/camel-test-infra-rocketmq/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-smb/pom.xml b/test-infra/camel-test-infra-smb/pom.xml
index 54661a31125ef..eb80299b377f3 100644
--- a/test-infra/camel-test-infra-smb/pom.xml
+++ b/test-infra/camel-test-infra-smb/pom.xml
@@ -38,6 +38,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
@@ -58,4 +63,4 @@
     </dependencies>
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/test-infra/camel-test-infra-solr/pom.xml b/test-infra/camel-test-infra-solr/pom.xml
index 8b7e3a5a9b008..65b549c42e907 100644
--- a/test-infra/camel-test-infra-solr/pom.xml
+++ b/test-infra/camel-test-infra-solr/pom.xml
@@ -24,16 +24,16 @@
         <relativePath>../camel-test-infra-parent/pom.xml</relativePath>
         <version>4.10.0-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <artifactId>camel-test-infra-solr</artifactId>
     <name>Camel :: Test Infra :: Solr</name>
-    
+
     <properties>
         <assembly.skipAssembly>false</assembly.skipAssembly>
     </properties>
-    
+
     <dependencies>
 
         <dependency>
@@ -41,21 +41,20 @@
             <artifactId>camel-test-infra-common</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
             <version>${testcontainers-version}</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
diff --git a/test-infra/camel-test-infra-tensorflow-serving/pom.xml b/test-infra/camel-test-infra-tensorflow-serving/pom.xml
index 48a543b3b54ec..7bdd7af277dc6 100644
--- a/test-infra/camel-test-infra-tensorflow-serving/pom.xml
+++ b/test-infra/camel-test-infra-tensorflow-serving/pom.xml
@@ -32,6 +32,11 @@
     <description>TensorFlow Serving test infrastructure for Camel</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-torchserve/pom.xml b/test-infra/camel-test-infra-torchserve/pom.xml
index 8f856e2b791d7..8d4aea5dae702 100644
--- a/test-infra/camel-test-infra-torchserve/pom.xml
+++ b/test-infra/camel-test-infra-torchserve/pom.xml
@@ -36,6 +36,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-triton/pom.xml b/test-infra/camel-test-infra-triton/pom.xml
index 68b88518cfed1..c451b0258982f 100644
--- a/test-infra/camel-test-infra-triton/pom.xml
+++ b/test-infra/camel-test-infra-triton/pom.xml
@@ -36,6 +36,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-xmpp/pom.xml b/test-infra/camel-test-infra-xmpp/pom.xml
index 3c72d82cbd977..6504a1905abc9 100644
--- a/test-infra/camel-test-infra-xmpp/pom.xml
+++ b/test-infra/camel-test-infra-xmpp/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>
diff --git a/test-infra/camel-test-infra-zookeeper/pom.xml b/test-infra/camel-test-infra-zookeeper/pom.xml
index b5cb5ae484716..b4eea6cd947e0 100644
--- a/test-infra/camel-test-infra-zookeeper/pom.xml
+++ b/test-infra/camel-test-infra-zookeeper/pom.xml
@@ -35,6 +35,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-common</artifactId>