diff --git a/.kitchen.yml b/.kitchen.yml
index 5ca774f..3b8e1f0 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -24,47 +24,87 @@
         "*":
           - mysql
           - mysqlver
-    mysqlver.sls:
-      mysql:
-        server:
-          enabled: true
-          version: "<%=ENV['MYSQL_VER'] || '5.7'%>"
 
 verifier:
   name: inspec
   sudo: true
 
+docker_images:
+  - &xenial-20163 <%=ENV['IMAGE_XENIAL_20163'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19'%>
+  - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
+  - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
 
 platforms:
-  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+  - name: xenial-2016.3
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+      image: *xenial-20163
+      platform: ubuntu
+
+  - name: xenial-2017.7
+    driver_config:
+      image: *xenial-20177
+      platform: ubuntu
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
       platform: ubuntu
 
 suites:
+<% for mysql_version in ['5.7'] %>
+  # - name: replication_both_"<%=mysql_version%>"
+  #   provisioner:
+  #     pillars-from-files:
+  #       mysql.sls: tests/pillar/replication_both.sls
+  #     pillars:
+  #       mysqlver.sls:
+  #         mysql:
+  #           server:
+  #             enabled: true
+  #             version: "<%=mysql_version%>"
 
-  - name: replication_both
-    provisioner:
-      pillars-from-files:
-        mysql.sls: tests/pillar/replication_both.sls
-
-  - name: replication_master
+  - name: replication_master_<%=mysql_version%>
     provisioner:
       pillars-from-files:
         mysql.sls: tests/pillar/replication_master.sls
+      pillars:
+        mysqlver.sls:
+          mysql:
+            server:
+              enabled: true
+              version: "<%=mysql_version%>"
 
-  - name: replication_slave
+  - name: replication_slave_<%=mysql_version%>
     provisioner:
       pillars-from-files:
         mysql.sls: tests/pillar/replication_slave.sls
+      pillars:
+        mysqlver.sls:
+          mysql:
+            server:
+              enabled: true
+              version: "<%=mysql_version%>"
 
-  - name: server_client_database
+  - name: server_client_database_<%=mysql_version%>
     provisioner:
       pillars-from-files:
         mysql.sls: tests/pillar/server_client_database.sls
+      pillars:
+        mysqlver.sls:
+          mysql:
+            server:
+              enabled: true
+              version: "<%=mysql_version%>"
 
-  - name: server_client_user
+  - name: server_client_user_<%=mysql_version%>
     provisioner:
       pillars-from-files:
         mysql.sls: tests/pillar/server_client_user.sls
+      pillars:
+        mysqlver.sls:
+          mysql:
+            server:
+              enabled: true
+              version: "<%=mysql_version%>"
+<% end %>
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file