diff --git a/client-device-connection-infinispan/pom.xml b/client-device-connection-infinispan/pom.xml
index 04a689c1bd..bd22b6e97a 100644
--- a/client-device-connection-infinispan/pom.xml
+++ b/client-device-connection-infinispan/pom.xml
@@ -30,12 +30,10 @@
       <groupId>org.eclipse.hono</groupId>
       <artifactId>hono-legal</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>org.eclipse.hono</groupId>
-      <artifactId>client-device-connection-base</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-core-jakarta</artifactId>
@@ -55,25 +53,23 @@
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-query-dsl</artifactId>
       <exclusions>
-       <exclusion>
-        <groupId>org.infinispan</groupId>
-        <artifactId>infinispan-commons</artifactId>
-       </exclusion>
+        <exclusion>
+          <groupId>org.infinispan</groupId>
+          <artifactId>infinispan-commons</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
-
-    <!-- TODO: these are repeated from client-device-connection-base. Keep or remove? -->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+      <groupId>org.eclipse.hono</groupId>
+      <artifactId>client-device-connection-base</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.hono</groupId>
-      <artifactId>hono-core</artifactId>
+      <artifactId>hono-client-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.hono</groupId>
-      <artifactId>hono-client-common</artifactId>
+      <artifactId>hono-core</artifactId>
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
@@ -120,13 +116,6 @@
     </dependency>
 
     <!-- testing -->
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk18on</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- TODO: these are repeated from client-device-connection-base. Keep or remove? -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
@@ -162,6 +151,11 @@
       <artifactId>core-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -185,4 +179,3 @@
     </plugins>
   </build>
 </project>
-