diff --git a/.travis.yml b/.travis.yml
index 6817872c6..3ce72700f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,8 @@ before_install:
 install:
   - npm install
 script:
-  - docker-compose build && docker-compose up
+  - sudo service mysql stop
+  - docker-compose build && docker-compose run lib
 deploy:
   - provider: script
     # Have to use `&&` because of issue https://github.com/travis-ci/dpl/issues/673
diff --git a/docker-compose.yml b/docker-compose.yml
index 0e145e3bf..8bf97c566 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,8 @@ services:
       - mysql
     networks:
       - overlay
+    environment:
+      WAIT_HOSTS: mysql:3306
 
 networks:
   overlay:
-    driver: bridge
diff --git a/e2e/health-checks/database.health.e2e-spec.ts b/e2e/health-checks/database.health.e2e-spec.ts
index ffeff8c61..78bdf6daa 100644
--- a/e2e/health-checks/database.health.e2e-spec.ts
+++ b/e2e/health-checks/database.health.e2e-spec.ts
@@ -32,7 +32,7 @@ describe('Database Health', () => {
         imports: [
           TypeOrmModule.forRoot({
             type: 'mysql',
-            host: '0.0.0.0',
+            host: 'mysql',
             port: 3306,
             username: 'root',
             password: 'root',