diff --git a/commons-test/pom.xml b/commons-test/pom.xml
index 4c4e00e29f90..e803005f401f 100644
--- a/commons-test/pom.xml
+++ b/commons-test/pom.xml
@@ -45,6 +45,11 @@
          <artifactId>blockhound</artifactId>
       </dependency>
 
+      <dependency>
+         <groupId>org.infinispan</groupId>
+         <artifactId>infinispan-api</artifactId>
+      </dependency>
+
       <!-- Add Micrometer dependencies to all tests -->
       <dependency>
          <groupId>io.micrometer</groupId>
diff --git a/query/pom.xml b/query/pom.xml
index 0258f4c59075..4f318d009879 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -20,6 +20,7 @@
       <dependency>
          <groupId>org.infinispan</groupId>
          <artifactId>infinispan-api</artifactId>
+         <optional>true</optional>
       </dependency>
 
       <dependency>
diff --git a/remote-query/remote-query-server/pom.xml b/remote-query/remote-query-server/pom.xml
index 5f8078b2060a..3a1ca230eefd 100644
--- a/remote-query/remote-query-server/pom.xml
+++ b/remote-query/remote-query-server/pom.xml
@@ -12,6 +12,12 @@
    <description>Infinispan Remote Query Server module</description>
 
    <dependencies>
+      <dependency>
+         <groupId>org.infinispan</groupId>
+         <artifactId>infinispan-api</artifactId>
+         <optional>true</optional>
+      </dependency>
+
       <dependency>
          <groupId>org.infinispan</groupId>
          <artifactId>infinispan-component-processor</artifactId>