diff --git a/.kitchen.yml b/.kitchen.yml
index b2b69e0..6b4b820 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -17,10 +17,10 @@
   dependencies:
     - name: mysql
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-mysql.git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/mysql.git
     - name: linux
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-linux.git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/linux.git
   state_top:
     base:
       "*":
@@ -34,45 +34,109 @@
           - repos_base
           - repos
           - galera
-    versions.sls:
-      galera:
-        version:
-          mysql: <%= ENV['MYSQL_VER'] || '5.6' %>
-          galera: <%= ENV['GALERA_VER'] || '3' %>
-    # NOTE(vsaienko) There is no guarntee that pillars are loaded before pillars-from-file
-    # as result we cant assume variables defined via pillars: are available when pillars-from-file
-    # is loaded. Move 'source' definitions of repos to .kitchen.yml as it used ENV variable
-    repos_base.sls:
-      linux:
-        system:
-          enabled: true
-          repo:
-            galeracluster:
-              source: deb http://releases.galeracluster.com/galera-<%=ENV['GALERA_VER'] || '3'%>/ubuntu {{ grains.get('oscodename') }} main
-            mysql-wsrep:
-              source: deb http://releases.galeracluster.com/mysql-wsrep-<%=ENV['MYSQL_VER'] || '5.6'%>/ubuntu {{ grains.get('oscodename') }} main
-  pillars-from-files:
-    repos.sls: tests/pillar/repo_galeracluster.sls
 
 verifier:
   name: inspec
   sudo: true
 
+docker_images:
+  - &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-2017.7
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+      image: *xenial-20177
+      platform: ubuntu
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
       platform: ubuntu
 
 suites:
-
-  - name: master_cluster
+  - name: master_cluster_galera3_mysql56
     provisioner:
       pillars-from-files:
         galera.sls: tests/pillar/master_cluster.sls
+        repos.sls: tests/pillar/repo_galeracluster.sls
+      pillars:
+        versions.sls:
+          galera:
+            version:
+              mysql: '5.6'
+              galera: '3'
+        repos_base.sls:
+          linux:
+            system:
+              enabled: true
+              repo:
+                galeracluster:
+                  source: deb http://releases.galeracluster.com/galera-3/ubuntu {{ grains.get('oscodename') }} main
+                mysql-wsrep:
+                  source: deb http://releases.galeracluster.com/mysql-wsrep-5.6/ubuntu {{ grains.get('oscodename') }} main
 
-  - name: slave_cluster
+  - name: slave_cluster_galera3_mysql56
     provisioner:
       pillars-from-files:
         galera.sls: tests/pillar/slave_cluster.sls
+        repos.sls: tests/pillar/repo_galeracluster.sls
+      pillars:
+        versions.sls:
+          galera:
+            version:
+              mysql: '5.6'
+              galera: '3'
+        repos_base.sls:
+          linux:
+            system:
+              enabled: true
+              repo:
+                galeracluster:
+                  source: deb http://releases.galeracluster.com/galera-3/ubuntu {{ grains.get('oscodename') }} main
+                mysql-wsrep:
+                  source: deb http://releases.galeracluster.com/mysql-wsrep-5.6/ubuntu {{ grains.get('oscodename') }} main
+
+  - name: master_cluster_galera3_mysql57
+    provisioner:
+      pillars-from-files:
+        galera.sls: tests/pillar/master_cluster.sls
+        repos.sls: tests/pillar/repo_galeracluster.sls
+      pillars:
+        versions.sls:
+          galera:
+            version:
+              mysql: '5.7'
+              galera: '3'
+        repos_base.sls:
+          linux:
+            system:
+              enabled: true
+              repo:
+                galeracluster:
+                  source: deb http://releases.galeracluster.com/galera-3/ubuntu {{ grains.get('oscodename') }} main
+                mysql-wsrep:
+                  source: deb http://releases.galeracluster.com/mysql-wsrep-5.7/ubuntu {{ grains.get('oscodename') }} main
+
+  - name: slave_cluster_galera3_mysql57
+    provisioner:
+      pillars-from-files:
+        galera.sls: tests/pillar/slave_cluster.sls
+        repos.sls: tests/pillar/repo_galeracluster.sls
+      pillars:
+        versions.sls:
+          galera:
+            version:
+              mysql: '5.7'
+              galera: '3'
+        repos_base.sls:
+          linux:
+            system:
+              enabled: true
+              repo:
+                galeracluster:
+                  source: deb http://releases.galeracluster.com/galera-3/ubuntu {{ grains.get('oscodename') }} main
+                mysql-wsrep:
+                  source: deb http://releases.galeracluster.com/mysql-wsrep-5.7/ubuntu {{ grains.get('oscodename') }} main
+
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125