diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 4595cc34e..c453546c4 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -34,13 +34,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>1.4.199</version>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 
   <build>
diff --git a/ebean-autotune/src/test/resources/application-test.properties b/ebean-autotune/src/test/resources/application-test.properties
index c8e3f5e50..5b8a89631 100644
--- a/ebean-autotune/src/test/resources/application-test.properties
+++ b/ebean-autotune/src/test/resources/application-test.properties
@@ -2,13 +2,10 @@ ebean.ddl.generate=true
 ebean.ddl.run=true
 datasource.default=h2
 
-#datasource.h2AutoTune.username=sa
-#datasource.h2AutoTune.password=sa
-#datasource.h2AutoTune.url=jdbc:h2:mem:h2AutoTune
-
 datasource.h2.username=sa
 datasource.h2.password=
 datasource.h2.url=jdbc:h2:mem:h2AutoTune
+
 datasource.pg.username=sa
 datasource.pg.password=
 datasource.pg.url=jdbc:h2:mem:h2AutoTune
diff --git a/ebean-querybean/src/test/resources/ebean.properties b/ebean-querybean/src/test/resources/application-test.properties
similarity index 60%
rename from ebean-querybean/src/test/resources/ebean.properties
rename to ebean-querybean/src/test/resources/application-test.properties
index dd0ff13a3..68e06a3f9 100644
--- a/ebean-querybean/src/test/resources/ebean.properties
+++ b/ebean-querybean/src/test/resources/application-test.properties
@@ -1,6 +1,3 @@
-
-#load.properties.override=${home}/config/myapp.ebean.properties
-
 ebean.ddl.generate=true
 ebean.ddl.run=true
 
@@ -9,4 +6,7 @@ datasource.default=h2
 datasource.h2.username=sa
 datasource.h2.password=
 datasource.h2.databaseUrl=jdbc:h2:mem:tests
-datasource.h2.databaseDriver=org.h2.Driver
+
+datasource.pg.username=sa
+datasource.pg.password=
+datasource.pg.databaseUrl=jdbc:h2:mem:tests
diff --git a/ebean-test/src/test/resources/application-test.yml b/ebean-test/src/test/resources/application-test.yaml
similarity index 95%
rename from ebean-test/src/test/resources/application-test.yml
rename to ebean-test/src/test/resources/application-test.yaml
index c5f3914d2..89eb92456 100644
--- a/ebean-test/src/test/resources/application-test.yml
+++ b/ebean-test/src/test/resources/application-test.yaml
@@ -3,7 +3,11 @@ datasource:
     username: sa
     password:
     databaseUrl: jdbc:h2:mem:tests
-    databaseDriver: org.h2.Driver
+
+  pg:
+    username: sa
+    password:
+    databaseUrl: jdbc:h2:mem:tests
 
 ebean:
 #  migration: