diff --git a/pom.xml b/pom.xml
index 9f221225..70e302c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -574,7 +574,7 @@
       <dependency>
         <groupId>org.hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
-        <version>1.8.0.10</version>
+        <version>2.2.8</version>
       </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>
diff --git a/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties b/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties
index e1a9696a..5621a702 100644
--- a/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties
+++ b/redback-common/redback-common-test-resources/src/main/resources/org/apache/archiva/redback/config-defaults.properties
@@ -27,7 +27,7 @@ application.timestamp=EEE d MMM yyyy HH:mm:ss Z
 jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
 #jdbc.url=jdbc:hsqldb:mem:redback-users-tests
 #jdbc.url=jdbc:derby:memory:users-test;create=true
-jdbc.url=jdbc:derby:users-test;create=true
+jdbc.url=jdbc:derby:memory:users-test;create=true
 jdbc.username=sa
 jdbc.password=
 
diff --git a/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties b/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
index e28bf4b3..22313266 100644
--- a/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
+++ b/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
@@ -24,7 +24,7 @@ application.timestamp=EEE d MMM yyyy HH:mm:ss Z
 # JDBC Setup
 
 jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
-jdbc.url=jdbc:derby:${plexus.home}/database;create=true
+jdbc.url=jdbc:derby:memory:users-tests;create=true
 jdbc.username=sa
 jdbc.password=
 
diff --git a/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties b/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties
index 6409f97c..63902ad1 100644
--- a/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties
+++ b/redback-data-management/src/test/resources/org/apache/archiva/redback/config-defaults.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-jdbc.url=jdbc:derby:target/database;create=true
+
 
 
 # --------------------------------------------------------------------
@@ -25,8 +25,9 @@ application.timestamp=EEE d MMM yyyy HH:mm:ss Z
 
 # --------------------------------------------------------------------
 # JDBC Setup
-
+jdbc.url=jdbc:derby:memory:users-tests;create=true
 jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
+
 jdbc.username=sa
 jdbc.password=
 
diff --git a/redback-data-management/src/test/resources/spring-context.xml b/redback-data-management/src/test/resources/spring-context.xml
index 5125b40c..ae1f6f99 100644
--- a/redback-data-management/src/test/resources/spring-context.xml
+++ b/redback-data-management/src/test/resources/spring-context.xml
@@ -31,7 +31,7 @@
   <bean name="jdoFactory#users" class="org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory">
     <property name="config" ref="userConfiguration"/>
     <property name="driverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
-    <property name="url" value="jdbc:derby:${basedir}/target" />
+    <property name="url" value="jdbc:derby:memory:users-test" />
     <property name="userName" value="sa"/>
     <property name="password" value=""/>
   </bean>
diff --git a/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties b/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
index 5ce27861..bbc9c1d2 100644
--- a/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
+++ b/redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
@@ -16,9 +16,6 @@
 # under the License.
 
 
-jdbc.url=jdbc:derby:target/database;create=true
-
-
 # --------------------------------------------------------------------
 # Application Configuration
 
@@ -26,7 +23,7 @@ application.timestamp=EEE d MMM yyyy HH:mm:ss Z
 
 # --------------------------------------------------------------------
 # JDBC Setup
-
+jdbc.url=jdbc:derby:memory:users-test;create=true
 jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
 jdbc.username=sa
 jdbc.password=