diff --git a/.travis.yml b/.travis.yml
index 9c40ca4e..57925ff7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,9 @@
 language: php
 
-dist: trusty
-group: deprecated-2017Q4
-
 matrix:
   include:
-  - php: nightly
+  - php: 5.3
+    dist: precise
     sudo: required
     services:
       - mysql
@@ -20,18 +18,10 @@ matrix:
       - php src/Ifsnop/Mysqldump/Mysqldump.php
       - vendor/bin/phpunit
       - cd tests && ./test.sh
-    addons:
-      apt:
-       sources:
-        - mysql-5.7-trusty
-       packages:
-        - mysql-server
-        - mysql-client
     before_install:
       - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-      - sudo mysql_upgrade -u root
-      - sudo service mysql restart
-  - php: 7.3
+  - php: 5.4
+    dist: precise
     sudo: required
     services:
       - mysql
@@ -46,18 +36,10 @@ matrix:
       - php src/Ifsnop/Mysqldump/Mysqldump.php
       - vendor/bin/phpunit
       - cd tests && ./test.sh
-    addons:
-      apt:
-       sources:
-        - mysql-5.7-trusty
-       packages:
-        - mysql-server
-        - mysql-client
     before_install:
       - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-      - sudo mysql_upgrade -u root
-      - sudo service mysql restart
-  - php: 7.2
+  - php: 5.5
+    dist: precise
     sudo: required
     services:
       - mysql
@@ -72,18 +54,28 @@ matrix:
       - php src/Ifsnop/Mysqldump/Mysqldump.php
       - vendor/bin/phpunit
       - cd tests && ./test.sh
-    addons:
-      apt:
-       sources:
-        - mysql-5.7-trusty
-       packages:
-        - mysql-server
-        - mysql-client
     before_install:
       - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-      - sudo mysql_upgrade -u root
-      - sudo service mysql restart
-  - php: 7.1
+  - php: 5.6
+    dist: precise
+    sudo: required
+    services:
+      - mysql
+    before_script:
+      - curl -s http://getcomposer.org/installer | php
+      - php composer.phar install
+      - mysql -V
+      - mysqldump -V
+      - tests/create_users.sh
+    script:
+      - php -l src/Ifsnop/Mysqldump/Mysqldump.php
+      - php src/Ifsnop/Mysqldump/Mysqldump.php
+      - vendor/bin/phpunit
+      - cd tests && ./test.sh
+    before_install:
+      - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
+  - php: 5.6
+    dist: xenial
     sudo: required
     services:
       - mysql
@@ -98,18 +90,10 @@ matrix:
       - php src/Ifsnop/Mysqldump/Mysqldump.php
       - vendor/bin/phpunit
       - cd tests && ./test.sh
-    addons:
-      apt:
-       sources:
-        - mysql-5.7-trusty
-       packages:
-        - mysql-server
-        - mysql-client
     before_install:
       - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-      - sudo mysql_upgrade -u root
-      - sudo service mysql restart
   - php: 7.0
+    dist: xenial
     sudo: required
     services:
       - mysql
@@ -124,18 +108,10 @@ matrix:
       - php src/Ifsnop/Mysqldump/Mysqldump.php
       - vendor/bin/phpunit
       - cd tests && ./test.sh
-    addons:
-      apt:
-       sources:
-        - mysql-5.7-trusty
-       packages:
-        - mysql-server
-        - mysql-client
     before_install:
       - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-      - sudo mysql_upgrade -u root
-      - sudo service mysql restart
-  - php: 5.6
+  - php: 7.1
+    dist: xenial
     sudo: required
     services:
       - mysql
@@ -150,18 +126,10 @@ matrix:
       - php src/Ifsnop/Mysqldump/Mysqldump.php
       - vendor/bin/phpunit
       - cd tests && ./test.sh
-    addons:
-      apt:
-       sources:
-        - mysql-5.7-trusty
-       packages:
-        - mysql-server
-        - mysql-client
     before_install:
       - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-      - sudo mysql_upgrade -u root
-      - sudo service mysql restart
-  - php: 5.4
+  - php: 7.2
+    dist: xenial
     sudo: required
     services:
       - mysql
@@ -176,18 +144,10 @@ matrix:
       - php src/Ifsnop/Mysqldump/Mysqldump.php
       - vendor/bin/phpunit
       - cd tests && ./test.sh
-    addons:
-      apt:
-       sources:
-        - mysql-5.7-trusty
-       packages:
-        - mysql-server
-        - mysql-client
     before_install:
       - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-      - sudo mysql_upgrade -u root
-      - sudo service mysql restart
-  - php: hhvm-3.18
+  - php: 7.3
+    dist: xenial
     sudo: required
     services:
       - mysql
@@ -202,18 +162,10 @@ matrix:
       - php src/Ifsnop/Mysqldump/Mysqldump.php
       - vendor/bin/phpunit
       - cd tests && ./test.sh
-    addons:
-      apt:
-       sources:
-        - mysql-5.7-trusty
-       packages:
-        - mysql-server
-        - mysql-client
     before_install:
       - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-      - sudo mysql_upgrade -u root
-      - sudo service mysql restart
-  - php: hhvm-3.21
+  - php: nightly
+    dist: xenial
     sudo: required
     services:
       - mysql
@@ -228,18 +180,10 @@ matrix:
       - php src/Ifsnop/Mysqldump/Mysqldump.php
       - vendor/bin/phpunit
       - cd tests && ./test.sh
-    addons:
-      apt:
-       sources:
-        - mysql-5.7-trusty
-       packages:
-        - mysql-server
-        - mysql-client
     before_install:
       - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-      - sudo mysql_upgrade -u root
-      - sudo service mysql restart
-  - php: hhvm-3.24
+  - php: hhvm-3.18
+    dist: xenial
     sudo: required
     services:
       - mysql
@@ -254,18 +198,10 @@ matrix:
       - php src/Ifsnop/Mysqldump/Mysqldump.php
       - vendor/bin/phpunit
       - cd tests && ./test.sh
-    addons:
-      apt:
-       sources:
-        - mysql-5.7-trusty
-       packages:
-        - mysql-server
-        - mysql-client
     before_install:
       - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-      - sudo mysql_upgrade -u root
-      - sudo service mysql restart
-  - php: hhvm-nightly
+  - php: hhvm-3.21
+    dist: xenial
     sudo: required
     services:
       - mysql
@@ -280,19 +216,10 @@ matrix:
       - php src/Ifsnop/Mysqldump/Mysqldump.php
       - vendor/bin/phpunit
       - cd tests && ./test.sh
-    addons:
-      apt:
-       sources:
-        - mysql-5.7-trusty
-       packages:
-        - mysql-server
-        - mysql-client
     before_install:
       - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-      - sudo mysql_upgrade -u root
-      - sudo service mysql restart
-  - php: 5.3
-    dist: precise
+  - php: hhvm-3.24
+    dist: xenial
     sudo: required
     services:
       - mysql
@@ -309,7 +236,26 @@ matrix:
       - cd tests && ./test.sh
     before_install:
       - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
+  - php: hhvm
+    dist: xenial
+    sudo: required
+    services:
+      - mysql
+    before_script:
+      - curl -s http://getcomposer.org/installer | php
+      - php composer.phar install
+      - mysql -V
+      - mysqldump -V
+      - tests/create_users.sh
+    script:
+      - php -l src/Ifsnop/Mysqldump/Mysqldump.php
+      - php src/Ifsnop/Mysqldump/Mysqldump.php
+      - vendor/bin/phpunit
+      - cd tests && ./test.sh
+    before_install:
+      - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
+
   allow_failures:
-    - php: nightly
-    - php: hhvm-nightly
     - php: 5.3
+    - php: nightly
+    - php: hhvm