diff --git a/.kitchen.yml b/.kitchen.yml
index 6f06138..a7f8412 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -36,40 +36,49 @@
           - linux_repo_openstack
           - nova
           - release
-  pillars-from-files:
-    linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'ocata' %>.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:
-
+<% for os_version in ['mitaka','newton','ocata','pike'] %>
   - name: compute_cluster
     provisioner:
       pillars-from-files:
         nova.sls: tests/pillar/compute_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           nova:
             compute:
-              version: <%= ENV['OS_VERSION'] || 'ocata' %>
+              version: <%=os_version%>
 
   - name: control_cluster
     provisioner:
       pillars-from-files:
         nova.sls: tests/pillar/control_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           nova:
             controller:
-              version: <%= ENV['OS_VERSION'] || 'ocata' %>
-
+              version: <%=os_version%>
+<% end %>
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125