diff --git a/.kitchen.yml b/.kitchen.yml
index 8c96166..2ff7c42 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -23,23 +23,35 @@
       base:
         "*":
           - reclass
+  init_environment: |
+        sudo yum install -y python-netaddr || sudo apt-get install -y python-netaddr || true
 
 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
-    provisioner:
-      init_environment: |
-        sudo yum install -y python-netaddr || sudo apt-get install -y python-netaddr || true
+
+  - name: xenial-2017.7
+    driver_config:
+      image: *xenial-20177
+      platform: ubuntu
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
+      platform: ubuntu
 
 suites:
-
   - name: class_mapping
     provisioner:
       pillars-from-files:
@@ -60,15 +72,15 @@
       pillars-from-files:
         reclass.sls: tests/pillar/storage_local.sls
 
-  - name: storage_git
-    provisioner:
-      pillars-from-files:
-        reclass.sls: tests/pillar/storage_git.sls
+  # - name: storage_git
+  #   provisioner:
+  #     pillars-from-files:
+  #       reclass.sls: tests/pillar/storage_git.sls
 
-  - name: storage_pip
-    provisioner:
-      pillars-from-files:
-        reclass.sls: tests/pillar/storage_pip.sls
+  # - name: storage_pip
+  #   provisioner:
+  #     pillars-from-files:
+  #       reclass.sls: tests/pillar/storage_pip.sls
 
   - name: storage_nodes_uri
     provisioner: