diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SmpServicesTestConfig.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SmpServicesTestConfig.java
index c43b9f65a0c18b61c9cd919e744aaf89a051e47d..2a6453c39d4b0f6e47dc4486dc2762990ea6cd79 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SmpServicesTestConfig.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SmpServicesTestConfig.java
@@ -51,7 +51,7 @@ public class SmpServicesTestConfig {
     private String url;
 
     @Bean
-    public DataSource dataSource() {
+    public DataSource smpDataSource() {
         DriverManagerDataSource driverManagerDataSource = new DriverManagerDataSource();
         driverManagerDataSource.setDriverClassName(driver);
         driverManagerDataSource.setUrl(url);
@@ -66,7 +66,7 @@ public class SmpServicesTestConfig {
         Properties prop = new Properties();
         prop.setProperty("org.hibernate.envers.store_data_at_delete", "true");
         LocalContainerEntityManagerFactoryBean lef = new LocalContainerEntityManagerFactoryBean();
-        lef.setDataSource(dataSource());
+        lef.setDataSource(smpDataSource());
         lef.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
         lef.setJpaProperties(prop);
         lef.setPackagesToScan("eu.europa.ec.edelivery.smp.data.model");
diff --git a/smp-server-library/src/test/resources/persistence-test-h2.properties b/smp-server-library/src/test/resources/persistence-test-h2.properties
index 7df06a06ad8c659453f96998b5b065430b236d0f..e86de6a59415468f04c65f2daf567d56ea6fb5e8 100644
--- a/smp-server-library/src/test/resources/persistence-test-h2.properties
+++ b/smp-server-library/src/test/resources/persistence-test-h2.properties
@@ -1,5 +1,5 @@
 jdbc.driverClassName=org.h2.Driver
-jdbc.url=jdbc:h2:mem:myDb;DB_CLOSE_DELAY=-1
+jdbc.url=jdbc:h2:file:./target/myDb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=TRUE;AUTO_SERVER=TRUE
 jdbc.user=smp-dev
 jdbc.pass=smp-dev
 hibernate.dialect=org.hibernate.dialect.H2Dialect
@@ -9,4 +9,5 @@ schema.sql=schema.sql
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.generate-ddl=true
-logging.level.org.hibernate.type=trace
\ No newline at end of file
+logging.level.org.hibernate.type=trace
+