diff --git a/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java b/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
index 84249a1d4..286e3525a 100644
--- a/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
+++ b/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
@@ -1,6 +1,7 @@
 package io.ebean.dbmigration;
 
 import io.ebean.annotation.Platform;
+import io.ebeaninternal.dbmigration.DbOffline;
 import org.junit.Test;
 
 public class DbMigrationSqlServerTest {
@@ -8,8 +9,12 @@ public class DbMigrationSqlServerTest {
   @Test(expected = IllegalArgumentException.class)
   public void need_explicitPlatform() {
 
-    DbMigration dbMigration = DbMigration.create();
-    dbMigration.setPlatform(Platform.SQLSERVER);
+    try {
+      DbMigration dbMigration = DbMigration.create();
+      dbMigration.setPlatform(Platform.SQLSERVER);
+    } finally {
+      DbOffline.reset();
+    }
   }
 
   @Test
@@ -17,6 +22,7 @@ public class DbMigrationSqlServerTest {
 
     DbMigration dbMigration = DbMigration.create();
     dbMigration.setPlatform(Platform.SQLSERVER16);
+    DbOffline.reset();
   }
 
   @Test
@@ -24,5 +30,6 @@ public class DbMigrationSqlServerTest {
 
     DbMigration dbMigration = DbMigration.create();
     dbMigration.setPlatform(Platform.SQLSERVER17);
+    DbOffline.reset();
   }
 }
diff --git a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
index 2d0bb7abf..e7614619b 100644
--- a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
@@ -33,10 +33,10 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     Properties properties = PropertiesLoader.load();
 
     DataSourceConfig dsConfig = new DataSourceConfig();
-    dsConfig.loadSettings(properties, "h2autocommit");//"h2autocommit","pg"
+    dsConfig.loadSettings(properties, "h2autocommit2");
     dsConfig.setAutoCommit(true);
 
-    DataSourcePool pool = new ConnectionPool("h2autocommit", dsConfig);
+    DataSourcePool pool = new ConnectionPool("h2autocommit2", dsConfig);
 
     Connection connection = pool.getConnection();
     assertTrue(connection.getAutoCommit());
@@ -45,7 +45,7 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     System.setProperty("ebean.ignoreExtraDdl", "true");
 
     ServerConfig config = new ServerConfig();
-    config.setName("h2autocommit");
+    config.setName("h2autocommit2");
     config.loadFromProperties();
     config.setDataSource(pool);
     config.setDefaultServer(false);
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 7f8ed9918..4b6fb04e4 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -19,7 +19,7 @@ ebean.ddl.generate=true
 ebean.ddl.run=true
 ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
-datasource.default=sqlserver
+datasource.default=h2
 
 ebean.autoReadOnlyDataSource=true
 
@@ -80,6 +80,12 @@ datasource.h2autocommit.password=
 datasource.h2autocommit.databaseUrl=jdbc:h2:mem:autocommittests
 datasource.h2autocommit.databaseDriver=org.h2.Driver
 
+datasource.h2autocommit2.autoCommit=true
+datasource.h2autocommit2.username=sa
+datasource.h2autocommit2.password=
+datasource.h2autocommit2.databaseUrl=jdbc:h2:mem:autocommit2tests
+datasource.h2autocommit2.databaseDriver=org.h2.Driver
+
 datasource.h2other.username=sa
 datasource.h2other.password=
 datasource.h2other.databaseUrl=jdbc:h2:mem:h2other