diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index c516d71baa..5296eeb69e 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -37,16 +37,6 @@
 
    <dependencies>
      <!-- ActiveMQ Artemis artifacts -->
-      <dependency>
-         <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-jms-client-all</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-      <dependency>
-         <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-jakarta-client-all</artifactId>
-         <version>${project.version}</version>
-      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-boot</artifactId>
@@ -127,6 +117,23 @@
          <artifactId>artemis-website</artifactId>
          <version>${project.version}</version>
       </dependency>
+
+      <!-- Must be optional to avoid passing on, as they clash
+           with each other, and contain duplicates of their deps
+           with those from the original jms client dep  -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-jms-client-all</artifactId>
+         <version>${project.version}</version>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-jakarta-client-all</artifactId>
+         <version>${project.version}</version>
+         <optional>true</optional>
+      </dependency>
+
       <!-- dependencies -->
        <dependency>
            <groupId>org.apache.activemq</groupId>
diff --git a/tests/e2e-tests/pom.xml b/tests/e2e-tests/pom.xml
index cc43a3be6f..dd3d82da88 100644
--- a/tests/e2e-tests/pom.xml
+++ b/tests/e2e-tests/pom.xml
@@ -48,16 +48,6 @@
          <version>${project.version}</version>
          <scope>compile</scope>
          <type>pom</type>
-         <exclusions>
-            <exclusion>
-               <groupId>org.apache.activemq</groupId>
-               <artifactId>artemis-jms-client-all</artifactId>
-            </exclusion>
-            <exclusion>
-               <groupId>org.apache.activemq</groupId>
-               <artifactId>artemis-jakarta-client-all</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.testcontainers</groupId>
diff --git a/tests/smoke-tests/pom.xml b/tests/smoke-tests/pom.xml
index 34298fc984..2be5cc24de 100644
--- a/tests/smoke-tests/pom.xml
+++ b/tests/smoke-tests/pom.xml
@@ -50,16 +50,6 @@
          <version>${project.version}</version>
          <scope>compile</scope>
          <type>pom</type>
-         <exclusions>
-            <exclusion>
-               <groupId>org.apache.activemq</groupId>
-               <artifactId>artemis-jms-client-all</artifactId>
-            </exclusion>
-            <exclusion>
-               <groupId>org.apache.activemq</groupId>
-               <artifactId>artemis-jakarta-client-all</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>