diff --git a/.kitchen.yml b/.kitchen.yml
index 34e288b..695e6c8 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -13,7 +13,7 @@
   log_level: error
   formula: horizon
   grains:
-    noservices: False
+    noservices: false
   dependencies:
     - name: apache
       repo: git
@@ -26,7 +26,8 @@
     top.sls:
       base:
         "*":
-          - apache_single
+          - linux_repo_openstack
+          - release
           - horizon
 
 verifier:
@@ -51,16 +52,27 @@
 #  - name: centos-7.1
 
 suites:
-  - name: cluster
+<% for os_version in ['ocata','pike', 'queens', 'rocky'] %>
+  - name: cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
-        apache_single.sls: tests/pillar/apache_single.sls
         horizon.sls: tests/pillar/cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          horizon:
+            server:
+              version: <%=os_version%>
 
-  - name: single
+  - name: single_<%=os_version%>
     provisioner:
       pillars-from-files:
-        apache_single.sls: tests/pillar/apache_single.sls
         horizon.sls: tests/pillar/single.sls
-
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          horizon:
+            server:
+              version: <%=os_version%>
+<% end %>
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125