diff --git a/.kitchen.yml b/.kitchen.yml
index c203e9e..cd2fcae 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -8,7 +8,7 @@
   name: salt_solo
   salt_install: bootstrap
   salt_bootstrap_url: https://bootstrap.saltstack.com
-  salt_version: <%=ENV['SALT_VERSION'] || 'latest'%>
+  salt_version: latest
   require_chef: false
   log_level: error
   formula: designate
@@ -18,19 +18,17 @@
     - name: linux
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
     - name: oslo_templates
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/oslo-templates
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
   state_top:
     base:
       "*":
         - linux
         - designate
   pillars:
-    release.sls:
-      designate:
-        server:
-          version: <%= ENV['OS_VERSION'] || 'pike' %>
     ssl.sls:
       designate:
         server:
@@ -77,41 +75,55 @@
           - linux_repo_openstack
           - designate
           - release
-  pillars-from-files:
-    linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'pike' %>.sls
 
 verifier:
   name: inspec
   sudo: true
 
+docker_images:
+  - &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: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+  - name: xenial-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: *xenial-20177
       platform: ubuntu
 
 suites:
-
-  - name: server_cluster
+<% for os_version in ['pike','queens'] %>
+  - name: server_cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
         designate.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          designate:
+            server:
+              version: <%=os_version%>
     verifier:
       inspec_tests:
-        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/server_cluster
+        - tests/integration/<%=os_version%>/server_cluster
 
-  - name: server_single
+  - name: server_single_<%=os_version%>
     provisioner:
       pillars-from-files:
         designate.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          designate:
+            server:
+              version: <%=os_version%>
     verifier:
       inspec_tests:
-        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/server_single
+        - tests/integration/<%=os_version%>/server_single
 
-  - name: server_cluster_ssl
+  - name: server_cluster_ssl_<%=os_version%>
     provisioner:
       pillars-from-files:
         designate.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         top.sls:
           base:
@@ -120,16 +132,21 @@
               - designate
               - release
               - ssl
+        release.sls:
+          designate:
+            server:
+              version: <%=os_version%>
     verifier:
       inspec_tests:
-        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/server_cluster
+        - tests/integration/<%=os_version%>/server_cluster
       attributes:
         ssl: true
 
-  - name: server_single_ssl
+  - name: server_single_ssl_<%=os_version%>
     provisioner:
       pillars-from-files:
         designate.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         top.sls:
           base:
@@ -138,10 +155,15 @@
               - designate
               - release
               - ssl
+        release.sls:
+          designate:
+            server:
+              version: <%=os_version%>
     verifier:
       inspec_tests:
-        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/server_single
+        - tests/integration/<%=os_version%>/server_single
       attributes:
         ssl: true
 
+<% end %>
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125