diff --git a/ebean-core/src/test/resources/ebean.properties b/ebean-core/src/test/resources/ebean.properties
index 783e40eea..953d2c720 100644
--- a/ebean-core/src/test/resources/ebean.properties
+++ b/ebean-core/src/test/resources/ebean.properties
@@ -73,20 +73,20 @@ datasource.db.databaseDriver=org.h2.Driver
 datasource.h2.username=sa
 datasource.h2.password=
 datasource.h2.url=jdbc:h2:mem:testsMem;DB_CLOSE_ON_EXIT=FALSE
+datasource.h2.poolListener=org.tests.basic.MyTestDataSourcePoolListener
+#datasource.h2.minConnections=1
+#datasource.h2.maxConnections=25
+#datasource.h2.capturestacktrace=true
+#datasource.h2.maxStackTraceSize=20
 #datasource.h2.driver=org.h2.Driver
-datasource.h2.minConnections=1
-datasource.h2.maxConnections=25
 #datasource.h2.heartbeatsql=select 1
 #datasource.h2.isolationlevel=read_committed
-#datasource.h2.capturestacktrace=true
-datasource.h2.maxStackTraceSize=20
-datasource.h2.poolListener=org.tests.basic.MyTestDataSourcePoolListener
 #datasource.h2.customProperties=IGNORECASE=TRUE;MODE=Oracle;
 
 
 datasource.h2multitenant.username=sa
 datasource.h2multitenant.password=
-datasource.h2multitenant.url=jdbc:h2:mem:h2multitenant;DB_CLOSE_ON_EXIT=FALSE
+datasource.h2multitenant.url=jdbc:h2:mem:h2multitenant
 
 datasource.h2autocommit.autoCommit=true
 datasource.h2autocommit.username=sa
@@ -100,11 +100,11 @@ datasource.h2autocommit2.url=jdbc:h2:mem:autocommit2tests
 
 datasource.h2other.username=sa
 datasource.h2other.password=
-datasource.h2other.url=jdbc:h2:mem:h2other;DB_CLOSE_ON_EXIT=FALSE
+datasource.h2other.url=jdbc:h2:mem:h2other
 
 datasource.h2otherfind.username=sa
 datasource.h2otherfind.password=
-datasource.h2otherfind.url=jdbc:h2:mem:h2otherfind;DB_CLOSE_ON_EXIT=FALSE
+datasource.h2otherfind.url=jdbc:h2:mem:h2otherfind
 
 datasource.h2ebasicver.username=sa
 datasource.h2ebasicver.password=