diff --git a/.travis.yml b/.travis.yml
index 367ae48..cfd61e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,12 @@ services:
 - docker
 env:
   matrix:
-  - POSTGRES_Skip=0 POSTGRES_Host=localhost POSTGRES_Port=5432 POSTGRES_Username=postgres
-    POSTGRES_Password=!Passw0rd POSTGRES_Database=typeorm_mg POSTGRES_SSL=0  MYSQL_Skip=0
-    MYSQL_Host=localhost MYSQL_Port=3306 MYSQL_Username=root MYSQL_Password=!Passw0rd
-    MYSQL_Database=typeorm_mg MYSQL_SSL=1 MARIADB_Skip=0 MARIADB_Host=localhost MARIADB_Port=3307
-    MARIADB_Username=root MARIADB_Password=!Passw0rd MARIADB_Database=typeorm_mg MARIADB_SSL=0
-    MSSQL_Skip=0 MSSQL_Host=localhost MSSQL_Port=1433 MSSQL_Username=sa MSSQL_Password=!Passw0rd
+  - POSTGRES_Skip=0 POSTGRES_Host=localhost POSTGRES_Port=5432 POSTGRES_Username=test
+    POSTGRES_Password=test POSTGRES_Database=test POSTGRES_SSL=0  MYSQL_Skip=0
+    MYSQL_Host=localhost MYSQL_Port=3306 MYSQL_Username=test MYSQL_Password=test
+    MYSQL_Database=test MYSQL_SSL=0 MARIADB_Skip=0 MARIADB_Host=localhost MARIADB_Port=3307
+    MARIADB_Username=test MARIADB_Password=test MARIADB_Database=test MARIADB_SSL=0
+    MSSQL_Skip=0 MSSQL_Host=localhost MSSQL_Port=1433 MSSQL_Username=sa MSSQL_Password=Admin12345
     MSSQL_Database=typeorm_mg MSSQL_SSL=0
     ORACLE_Skip=0
     ORACLE_Host=localhost
@@ -33,7 +33,7 @@ before_install:
 - if [ -z "$DOCKER_USERNAME" ]; then echo "DOCKER_USERNAME is unset"; else echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; fi
 - if [ -z "$DOCKER_USERNAME" ]; then mv docker-compose-without-login.yml docker-compose.yml; fi
 - if [ -z "$DOCKER_USERNAME" ]; then export ORACLE_Skip=1; fi
-- docker-compose pull --parallel --ignore-pull-failures 
+- docker-compose pull --parallel --ignore-pull-failures
 - docker-compose up -d
 - npm install -g npm@5
 - npm install -g greenkeeper-lockfile@1
diff --git a/docker-compose.yml b/docker-compose.yml
index badf4fc..5ff1d03 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,21 +3,27 @@ services:
 
   # mysql
   mysql:
-    image: "mysql:5.7.19"
+    image: "mysql:5.7.10"
     container_name: "typeorm-mg-mysql"
     ports:
       - "3306:3306"
     environment:
-      MYSQL_ROOT_PASSWORD: "!Passw0rd"
+      MYSQL_ROOT_PASSWORD: "admin"
+      MYSQL_USER: "test"
+      MYSQL_PASSWORD: "test"
+      MYSQL_DATABASE: "test"
 
   # mariadb
   mariadb:
-    image: "mariadb:10.2.9"
+    image: "mariadb:10.1.16"
     container_name: "typeorm-mg-mariadb"
     ports:
       - "3307:3306"
     environment:
-      MYSQL_ROOT_PASSWORD: "!Passw0rd"
+      MYSQL_ROOT_PASSWORD: "admin"
+      MYSQL_USER: "test"
+      MYSQL_PASSWORD: "test"
+      MYSQL_DATABASE: "test"
 
   # postgres
   postgres:
@@ -26,17 +32,19 @@ services:
     ports:
       - "5432:5432"
     environment:
-      POSTGRES_PASSWORD: "!Passw0rd"
+      POSTGRES_USER: "test"
+      POSTGRES_PASSWORD: "test"
+      POSTGRES_DB: "test"
 
   # mssql
   mssql:
-    image: "microsoft/mssql-server-linux:2017-CU4"
+    image: "mcr.microsoft.com/mssql/server:2017-GA-ubuntu"
     container_name: "typeorm-mg-mssql"
     ports:
       - "1433:1433"
     environment:
+      SA_PASSWORD: "Admin12345"
       ACCEPT_EULA: "Y"
-      SA_PASSWORD: "!Passw0rd"
 
   # oracle
   oracle:
diff --git a/test/utils/GeneralTestUtils.ts b/test/utils/GeneralTestUtils.ts
index 596e9e1..d481785 100644
--- a/test/utils/GeneralTestUtils.ts
+++ b/test/utils/GeneralTestUtils.ts
@@ -226,7 +226,7 @@ export async function createSQLiteModels(filesOrgPath: string, resultsPath: stri
 export async function createMysqlModels(filesOrgPath: string, resultsPath: string): Promise<Engine> {
     let driver: AbstractDriver;
     driver = new MysqlDriver();
-    await driver.ConnectToServer(`mysql`, String(process.env.MYSQL_Host), Number(process.env.MYSQL_Port), String(process.env.MYSQL_Username), String(process.env.MYSQL_Password), yn(process.env.MYSQL_SSL));
+    await driver.ConnectToServer(String(process.env.MYSQL_Database), String(process.env.MYSQL_Host), Number(process.env.MYSQL_Port), String(process.env.MYSQL_Username), String(process.env.MYSQL_Password), yn(process.env.MYSQL_SSL));
 
     if (await driver.CheckIfDBExists(String(process.env.MYSQL_Database))) {
         await driver.DropDB(String(process.env.MYSQL_Database));
@@ -281,7 +281,7 @@ export async function createMysqlModels(filesOrgPath: string, resultsPath: strin
 export async function createMariaDBModels(filesOrgPath: string, resultsPath: string): Promise<Engine> {
     let driver: AbstractDriver;
     driver = new MariaDbDriver();
-    await driver.ConnectToServer(`mysql`, String(process.env.MARIADB_Host), Number(process.env.MARIADB_Port), String(process.env.MARIADB_Username), String(process.env.MARIADB_Password), yn(process.env.MARIADB_SSL));
+    await driver.ConnectToServer(String(process.env.MARIADB_Database), String(process.env.MARIADB_Host), Number(process.env.MARIADB_Port), String(process.env.MARIADB_Username), String(process.env.MARIADB_Password), yn(process.env.MARIADB_SSL));
 
     if (await driver.CheckIfDBExists(String(process.env.MARIADB_Database))) {
         await driver.DropDB(String(process.env.MARIADB_Database));