diff --git a/.kitchen.yml b/.kitchen.yml
index 3b7ab0b..f756728 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -83,21 +83,7 @@ suites:
       'centos-7',
       'fedora-25',
       'ubuntu-14.04'
-     ]
-
-  - name: client56-mysql
-    run_list:
-    - recipe[mysql2_chef_gem_test::default]
-    attributes:
-      mysql2_chef_gem:
-       package_version: '5.6'
-       provider: 'mysql'
-    includes: [
-      'centos-6',
-      'centos-7',
-      'fedora-25',
-      'ubuntu-16.04'
-     ]
+      ]
 
   - name: client57-mysql
     run_list:
@@ -108,7 +94,8 @@ suites:
        provider: 'mysql'
     includes: [
       'centos-6',
-      'centos-7'
+      'centos-7',
+      'ubuntu-16.04'
      ]
 
   - name: client57-mariadb
diff --git a/.travis.yml b/.travis.yml
index e3e1813..0e1dfa0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,14 +19,16 @@ services: docker
 
 env:
   matrix:
+
   - INSTANCE=client55-mysql-centos-6
   - INSTANCE=client55-mysql-centos-7
+  - INSTANCE=client55-mysql-ubuntu-1404
   - INSTANCE=client56-mysql-centos-6
   - INSTANCE=client56-mysql-centos-7
+  - INSTANCE=client56-mysql-ubuntu-1404
   - INSTANCE=client57-mysql-centos-6
   - INSTANCE=client57-mysql-centos-7
-  - INSTANCE=client55-mysql-ubuntu-1404
-  - INSTANCE=client56-mysql-ubuntu-1404
+  - INSTANCE=client57-mysql-ubuntu-1604
   - INSTANCE=client55-mariadb-ubuntu-1404
 
 # Ensure we make ChefDK's Ruby the default