diff --git a/.kitchen.yml b/.kitchen.yml
index eb4ed88..9901242 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -32,15 +32,28 @@
   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:
-
   - name: network
     provisioner:
       pillars-from-files:
@@ -67,14 +80,6 @@
       pillars-from-files:
         linux.sls: tests/pillar/system.sls
 
-  - name: system_file
-    provisioner:
-      pillars-from-files:
-        linux.sls: tests/pillar/system_file.sls
-      pillars_from_directories:
-        - source: tests/example
-          dest: srv/salt/linux/files/test
-
   - name: duo
     provisioner:
       pillars-from-files: