diff --git a/artemis-jdbc-store/pom.xml b/artemis-jdbc-store/pom.xml
index eea69078a6..6066ed895e 100644
--- a/artemis-jdbc-store/pom.xml
+++ b/artemis-jdbc-store/pom.xml
@@ -75,6 +75,11 @@
          <artifactId>derby</artifactId>
          <scope>test</scope>
       </dependency>
+      <dependency>
+         <groupId>org.apache.derby</groupId>
+         <artifactId>derbytools</artifactId>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>org.postgresql</groupId>
          <artifactId>postgresql</artifactId>
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index bbfbce71dd..e21b69ceb3 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -236,6 +236,11 @@
          <artifactId>derby</artifactId>
          <scope>test</scope>
       </dependency>
+      <dependency>
+         <groupId>org.apache.derby</groupId>
+         <artifactId>derbytools</artifactId>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>org.mockito</groupId>
          <artifactId>mockito-core</artifactId>
diff --git a/pom.xml b/pom.xml
index 689f99ccda..dc8cca7c65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
       <commons.config.version>2.9.0</commons.config.version>
       <commons.lang.version>3.14.0</commons.lang.version>
       <activemq5-version>5.18.3</activemq5-version>
-      <apache.derby.version>10.14.2.0</apache.derby.version>
+      <apache.derby.version>10.15.2.0</apache.derby.version>
       <commons.beanutils.version>1.9.4</commons.beanutils.version>
       <commons.logging.version>1.3.0</commons.logging.version>
       <commons.dbcp2.version>2.11.0</commons.dbcp2.version>
@@ -366,6 +366,12 @@
             <version>${apache.derby.version}</version>
             <scope>test</scope>
          </dependency>
+         <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <version>${apache.derby.version}</version>
+            <scope>test</scope>
+         </dependency>
          <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>mqtt-client</artifactId>
diff --git a/tests/activemq5-unit-tests/pom.xml b/tests/activemq5-unit-tests/pom.xml
index f51e3b64be..d97b2dd278 100644
--- a/tests/activemq5-unit-tests/pom.xml
+++ b/tests/activemq5-unit-tests/pom.xml
@@ -108,6 +108,11 @@
          <artifactId>derby</artifactId>
          <scope>test</scope>
       </dependency>
+      <dependency>
+         <groupId>org.apache.derby</groupId>
+         <artifactId>derbytools</artifactId>
+         <scope>test</scope>
+      </dependency>
 
       <dependency>
          <groupId>org.springframework</groupId>
diff --git a/tests/db-tests/pom.xml b/tests/db-tests/pom.xml
index 108fb8c706..1abd75c2d7 100644
--- a/tests/db-tests/pom.xml
+++ b/tests/db-tests/pom.xml
@@ -188,6 +188,11 @@
          <artifactId>derby</artifactId>
          <scope>test</scope>
       </dependency>
+      <dependency>
+         <groupId>org.apache.derby</groupId>
+         <artifactId>derbytools</artifactId>
+         <scope>test</scope>
+      </dependency>
 
 
    </dependencies>
@@ -253,6 +258,8 @@
                   <configuration>
                      <libList>
                         <arg>org.apache.derby:derby:${apache.derby.version}</arg>
+                        <arg>org.apache.derby:derbytools:${apache.derby.version}</arg>
+                        <arg>org.apache.derby:derbyshared:${apache.derby.version}</arg>
                      </libList>
                      <targetFolder>${basedir}/target/derby/jdbc-jars</targetFolder>
                   </configuration>
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 0cf512d1ef..a4320ec6ee 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -324,6 +324,11 @@
          <artifactId>derby</artifactId>
          <scope>test</scope>
       </dependency>
+      <dependency>
+         <groupId>org.apache.derby</groupId>
+         <artifactId>derbytools</artifactId>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>org.postgresql</groupId>
          <artifactId>postgresql</artifactId>
diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml
index 3dc3da8078..d9fcaf75be 100644
--- a/tests/stress-tests/pom.xml
+++ b/tests/stress-tests/pom.xml
@@ -109,6 +109,11 @@
          <version>${apache.derby.version}</version>
          <scope>test</scope>
       </dependency>
+      <dependency>
+         <groupId>org.apache.derby</groupId>
+         <artifactId>derbytools</artifactId>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-unit-test-support</artifactId>