diff --git a/.kitchen.yml b/.kitchen.yml
index bdfb2b6..65961cd 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -28,28 +28,44 @@
   name: inspec
   sudo: true
 
+docker_images:
+  - &trusty-20177 <%=ENV['IMAGE_TRUSTY_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2017.7/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: trusty-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: *trusty-20177
+      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: apache_server_php5
+  - name: server-php5
     provisioner:
       pillars-from-files:
-        apache.sls: tests/pillar/apache_server_php5.sls
+        apache.sls: tests/pillar/server_php5.sls
+    includes: trusty-2017.7
 
-  - name: apache_server_php7
+  - name: server-php7
     provisioner:
       pillars-from-files:
-        apache.sls: tests/pillar/apache_server_php7.sls
+        apache.sls: tests/pillar/server_php7.sls
+    excludes: trusty-2017.7
 
-  - name: apache_server_php7_ssl
+  - name: server-php7-ssl
     provisioner:
       pillars-from-files:
-        apache.sls: tests/pillar/apache_server_php7_ssl.sls
+        apache.sls: tests/pillar/server_php7_ssl.sls
+    excludes: trusty-2017.7
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125