diff --git a/src/test/resources/infrastructure.xml b/src/test/resources/infrastructure.xml
index 17900111d..e9ed3c8d7 100644
--- a/src/test/resources/infrastructure.xml
+++ b/src/test/resources/infrastructure.xml
@@ -26,7 +26,7 @@
 
 	<bean name="sampleEvaluationContextExtension" class="org.springframework.data.jpa.repository.sample.SampleEvaluationContextExtension"/>
 	
-	<jdbc:embedded-database id="dataSource" type="HSQL">
+	<jdbc:embedded-database id="dataSource" type="HSQL" generate-name="true">
 		<jdbc:script execution="INIT" separator="/;" location="classpath:scripts/hsqldb-init.sql"/>
 		<jdbc:script execution="INIT" separator="/;" location="classpath:scripts/schema-stored-procedures.sql"/>
 	</jdbc:embedded-database>
diff --git a/src/test/resources/multiple-entity-manager-integration-context.xml b/src/test/resources/multiple-entity-manager-integration-context.xml
index 0bafb31bd..01117b144 100644
--- a/src/test/resources/multiple-entity-manager-integration-context.xml
+++ b/src/test/resources/multiple-entity-manager-integration-context.xml
@@ -27,7 +27,7 @@
 	<bean id="entityManagerFactory-2" parent="abstractEntityManagerFactory">
 		<property name="persistenceUnitName" value="second" />
 		<property name="dataSource">
-			<jdbc:embedded-database type="HSQL" />
+			<jdbc:embedded-database type="HSQL" generate-name="true"/>
 		</property>
 	</bean>
 
diff --git a/src/test/resources/openjpa.xml b/src/test/resources/openjpa.xml
index 4ceca067d..fecf9a23c 100644
--- a/src/test/resources/openjpa.xml
+++ b/src/test/resources/openjpa.xml
@@ -21,5 +21,5 @@
 		make OpenJPA tests work. Open JPA doesn't work with hsqldb 2.x and runs with 
 		1.x instead which doesn't support stored procedures which leads to errors 
 		at runtime when the scripts/schema-stored-procedure.sql is executed, therefore we omit the script here. -->
-	<jdbc:embedded-database id="dataSource" type="HSQL" />
+	<jdbc:embedded-database id="dataSource" type="HSQL" generate-name="true"/>
 </beans>