diff --git a/pom.xml b/pom.xml
index 2639ec282..f3e7f3cb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,6 +198,13 @@
       <!--<scope>test</scope>-->
     <!--</dependency>-->
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-docker-run</artifactId>
+      <version>1.5.1</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
diff --git a/src/test/resources/docker-run.properties b/src/test/resources/docker-run.properties
new file mode 100644
index 000000000..c5f5af698
--- /dev/null
+++ b/src/test/resources/docker-run.properties
@@ -0,0 +1,22 @@
+
+#sqlserver.version=2017-CU2
+#sqlserver.port=1433
+#sqlserver.dbName=test_ebean
+#sqlserver.dbUser=test_ebean
+#sqlserver.dbPassword=SqlS3rv#r
+#sqlserver.startMode=dropcreate
+
+#oracle.version=latest
+#oracle.dbUser=test_ebean
+#oracle.dbPassword=test
+##oracle.startMode=dropcreate
+
+#mysql.version=5.7
+#mysql.startMode=dropcreate
+
+#postgres.version=9.6
+##postgres.dbName=test_db
+##postgres.dbUser=test_user
+##postgres.dbPassword=test
+##postgres.port=6432
+#postgres.dbExtensions=hstore,pgcrypto
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 7aa2bff92..9e9a42ac8 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -111,10 +111,10 @@ datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:3306/unit
 datasource.mysql.databaseDriver=com.mysql.jdbc.Driver
 
 
-datasource.ora.username=test_user
-datasource.ora.password=test
-datasource.ora.databaseUrl=jdbc:oracle:thin:@127.0.0.1:1521:XE
-datasource.ora.databaseDriver=oracle.jdbc.driver.OracleDriver
+datasource.oracle.username=test_ebean
+datasource.oracle.password=test
+datasource.oracle.databaseUrl=jdbc:oracle:thin:@localhost:1521:XE
+datasource.oracle.databaseDriver=oracle.jdbc.driver.OracleDriver
 
 ## set this to use timestamp rather than timestamptz
 #ebean.postgres.timestamp=timestamp
@@ -126,11 +126,10 @@ datasource.pg.databaseDriver=org.postgresql.Driver
 #datasource.pg.capturestacktrace=true
 datasource.pg.maxStackTraceSize=50
 
-#TODO we need an sqlserver for travis - maybe from azure cloud
-datasource.mssql.username=ebean
-datasource.mssql.password=ebean
-datasource.mssql.databaseUrl=jdbc:sqlserver://10.75.1.45:1433;databaseName=ebean_unittest;selectMethod=cursor
-datasource.mssql.databaseDriver=com.microsoft.sqlserver.jdbc.SQLServerDriver
+datasource.sqlserver.username=test_ebean
+datasource.sqlserver.password=SqlS3rv#r
+datasource.sqlserver.databaseUrl=jdbc:sqlserver://localhost:1433;databaseName=test_ebean;selectMethod=cursor
+datasource.sqlserver.databaseDriver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 
 datasource.db2.username=db2admin
 datasource.db2.password=veryverysecret#1234
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 9dfce8911..a86b99666 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -79,6 +79,9 @@
   <logger name="org.tests" level="INFO"/>
   <logger name="io.ebean" level="INFO"/>
 
+  <!--<logger name="org.avaje.docker" level="TRACE"/>-->
+  <!--<logger name="io.ebean.DDL" level="DEBUG"/>-->
+
   <logger name="io.ebean.SQL" level="TRACE"/>
   <logger name="io.ebean.TXN" level="TRACE"/>
   <logger name="io.ebean.SUM" level="TRACE"/>