diff --git a/.kitchen.yml b/.kitchen.yml
index 9b54d47..f5441ab 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -17,7 +17,7 @@
   dependencies:
     - name: linux
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-linux
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
   state_top:
     base:
       "*":
@@ -32,42 +32,59 @@
   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: server_rdiff
+  - name: server-rdiff
     provisioner:
       pillars-from-files:
         backupninja.sls: tests/pillar/server_rdiff.sls
 
-  - name: client_rsync
+  - name: client-rsync
     provisioner:
       pillars-from-files:
         backupninja.sls: tests/pillar/client_rsync.sls
 
-  - name: client_rsync_backup_times
+  - name: client-rsync-backup-times
     provisioner:
       pillars-from-files:
         backupninja.sls: tests/pillar/client_rsync_backup_times.sls
+    excludes: xenial-2016.3
 
-  - name: client_s3
+  - name: client-s3
     provisioner:
       pillars-from-files:
         backupninja.sls: tests/pillar/client_s3.sls
 
-  - name: client_s3_disabled_auto
+  - name: client-s3-disabled-auto
     provisioner:
       pillars-from-files:
         backupninja.sls: tests/pillar/client_s3_disabled_auto.sls
+    excludes: xenial-2016.3
 
-  - name: client_webdav
+  - name: client-webdav
     provisioner:
       pillars-from-files:
         backupninja.sls: tests/pillar/client_webdav.sls
+
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125