diff --git a/.travis.yml b/.travis.yml
index c18a24bea7..6943a67ffe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,9 +40,6 @@ before_install:
   - "[[ $GEM != 'av:ujs' ]] || nvm install node"
   - "[[ $GEM != 'av:ujs' ]] || node --version"
   - "[[ $GEM != 'av:ujs' ]] || (cd actionview && npm install)"
-  - "[[ $GEM != 'ar:mysql2' ]] || [[ $MYSQL == 'mariadb' ]] || sudo mysql -e \"use mysql; update user set authentication_string='' where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;\""
-  - "[[ $GEM != 'ar:mysql2' ]] || [[ $MYSQL == 'mariadb' ]] || sudo mysql_upgrade"
-  - "[[ $GEM != 'ar:mysql2' ]] || [[ $MYSQL == 'mariadb' ]] || sudo service mysql restart"
 
 before_script:
   # Set Sauce Labs username and access key. Obfuscated, purposefully not encrypted.
@@ -60,7 +57,6 @@ env:
     - "GEM=ap,ac"
     - "GEM=am,amo,as,av,aj,ast"
     - "GEM=as PRESERVE_TIMEZONES=1"
-    - "GEM=ar:mysql2"
     - "GEM=ar:sqlite3"
     - "GEM=ar:postgresql"
     - "GEM=guides"
@@ -93,6 +89,27 @@ matrix:
         - memcached
         - redis-server
         - rabbitmq
+    - rvm: 2.4.4
+      env: "GEM=ar:mysql2"
+      sudo: required
+      before_install:
+        - "sudo mysql -e \"use mysql; update user set authentication_string='' where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;\""
+        - "sudo mysql_upgrade"
+        - "sudo service mysql restart"
+    - rvm: 2.5.1
+      env: "GEM=ar:mysql2"
+      sudo: required
+      before_install:
+        - "sudo mysql -e \"use mysql; update user set authentication_string='' where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;\""
+        - "sudo mysql_upgrade"
+        - "sudo service mysql restart"
+    - rvm: ruby-head
+      env: "GEM=ar:mysql2"
+      sudo: required
+      before_install:
+        - "sudo mysql -e \"use mysql; update user set authentication_string='' where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;\""
+        - "sudo mysql_upgrade"
+        - "sudo service mysql restart"
     - rvm: 2.5.1
       env:
         - "GEM=ar:mysql2 MYSQL=mariadb"