diff --git a/.kitchen.yml b/.kitchen.yml
index c39dae4..e460dd4 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -23,6 +23,10 @@
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/apache
       branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
+    - name: oslo_templates
+      repo: git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/oslo-templates
+      branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
   state_top:
     base:
       "*":
@@ -43,8 +47,7 @@
   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'%>
+  - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2017.7:latest'%>
 
 platforms:
   - name: xenial-2017.7
@@ -52,73 +55,71 @@
       image: *xenial-20177
       platform: ubuntu
 
-  - name: xenial-stable
-    driver_config:
-      image: *xenial-stable
-      platform: ubuntu
-
 suites:
-  - name: server_cluster_pike_40_file
+<% versions = { "pike" => "4.0", "queens" => "4.2" } %>
+<% versions.each do |os_version, gnocchi_version| %>
+  - name: server_cluster_<%=os_version%>_<%=gnocchi_version%>_file
     provisioner:
       pillars-from-files:
         gnocchi.sls: tests/pillar/server_cluster.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           gnocchi:
             common:
-              version: '4.0'
+              version: '<%=gnocchi_version%>'
         storage.sls:
           gnocchi:
             common:
               storage:
                 driver: file
 
-  - name: server_single_pike_40_file
+  - name: server_single_<%=os_version%>_<%=gnocchi_version%>_file
     provisioner:
       pillars-from-files:
         gnocchi.sls: tests/pillar/server_single.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           gnocchi:
             common:
-              version: '4.0'
+              version: '<%=gnocchi_version%>'
         storage.sls:
           gnocchi:
             common:
               storage:
                 driver: file
 
-  - name: server_cluster_pike_40_redis
+  - name: server_cluster_<%=os_version%>_<%=gnocchi_version%>_redis
     provisioner:
       pillars-from-files:
         gnocchi.sls: tests/pillar/server_cluster.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           gnocchi:
             common:
-              version: '4.0'
+              version: '<%=gnocchi_version%>'
         storage.sls:
           gnocchi:
             common:
               storage:
                 driver: redis
 
-  - name: server_single_pike_40_redis
+  - name: server_single_<%=os_version%>_<%=gnocchi_version%>_redis
     provisioner:
       pillars-from-files:
         gnocchi.sls: tests/pillar/server_single.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           gnocchi:
             common:
-              version: '4.0'
+              version: '<%=gnocchi_version%>'
         storage.sls:
           gnocchi:
             common:
               storage:
                 driver: redis
+<% end %>
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125