diff --git a/.kitchen.yml b/.kitchen.yml
index 761d083..ab69bcc 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -32,8 +32,6 @@
         "*":
           - linux_repo_openstack
           - glance
-  pillars-from-files:
-    linux_repo_openstack.sls: tests/pillar/repo_mos9.sls
 
 verifier:
   name: inspec
@@ -56,23 +54,49 @@
       platform: ubuntu
 
 suites:
+<% for os_version in ['ocata','pike','queens','rocky'] %>
   - name: cluster
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        glance.sls:
+          glance:
+            server:
+              version: "<%=os_version%>"
 
   - name: single_ceph
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/single_ceph.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        glance.sls:
+          glance:
+            server:
+              version: "<%=os_version%>"
 
   - name: single_barbican
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/single_barbican.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        glance.sls:
+          glance:
+            server:
+              version: "<%=os_version%>"
 
   - name: single
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/single.sls
-# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        glance.sls:
+          glance:
+            server:
+              version: "<%=os_version%>"
+<% end %>
+# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file