diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index f0bb12314..5ba7e6923 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -182,9 +182,9 @@
                 </dependency>
             </dependencies>
             <properties>
-                <hsqldb.version>1.8.0.7</hsqldb.version>
                 <connection.driver.name>org.hsqldb.jdbcDriver</connection.driver.name>
-                <connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url>
+                <!--<connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url>-->
+                <connection.url>jdbc:hsqldb:mem:openjpa20-hsqldb-database</connection.url>
                 <connection.username>sa</connection.username>
                 <connection.password />
             </properties>
diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml
index d31e5563a..96b3e1f11 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -184,9 +184,9 @@
                 </dependency>
             </dependencies>
             <properties>
-                <hsqldb.version>1.8.0.7</hsqldb.version>
                 <connection.driver.name>org.hsqldb.jdbcDriver</connection.driver.name>
-                <connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url>
+                <!--<connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url>-->
+                <connection.url>jdbc:hsqldb:mem:openjpa20-hsqldb-database</connection.url>
                 <connection.username>sa</connection.username>
                 <connection.password />
             </properties>
diff --git a/pom.xml b/pom.xml
index b99ac7763..99cf8d225 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <checkstyle.config.location>../openjpa-project/checkstyle.xml</checkstyle.config.location>
         <derby.version>10.2.2.0</derby.version>
+        <hsqldb.version>1.8.0.10</hsqldb.version>
     </properties>
 
     <!--
@@ -530,7 +531,7 @@
             <dependency>
                 <groupId>hsqldb</groupId>
                 <artifactId>hsqldb</artifactId>
-                <version>1.8.0.1</version>
+                <version>${hsqldb.version}</version>
             </dependency>
             <dependency>
                 <groupId>jakarta-regexp</groupId>