diff --git a/.kitchen.yml b/.kitchen.yml
index 4824ac1..f0ee928 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -51,18 +51,38 @@
       platform: ubuntu
 
 suites:
+<% for os_version in ['ocata','pike','queens','rocky'] %>
   - name: server_cluster
     provisioner:
       pillars-from-files:
         heat.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          heat:
+            server:
+              version: <%=os_version%>
 
   - name: server_plugin_dirs
     provisioner:
       pillars-from-files:
         heat.sls: tests/pillar/server_plugin_dirs.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          heat:
+            server:
+              version: <%=os_version%>
 
   - name: server_single
     provisioner:
       pillars-from-files:
         heat.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          heat:
+            server:
+              version: <%=os_version%>
+<% end %>
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125