diff --git a/.kitchen.yml b/.kitchen.yml
index f0ee928..2daaf44 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -52,7 +52,7 @@
 
 suites:
 <% for os_version in ['ocata','pike','queens','rocky'] %>
-  - name: server_cluster
+  - name: server_cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
         heat.sls: tests/pillar/server_cluster.sls
@@ -63,7 +63,7 @@
             server:
               version: <%=os_version%>
 
-  - name: server_plugin_dirs
+  - name: server_plugin_dirs_<%=os_version%>
     provisioner:
       pillars-from-files:
         heat.sls: tests/pillar/server_plugin_dirs.sls
@@ -74,7 +74,7 @@
             server:
               version: <%=os_version%>
 
-  - name: server_single
+  - name: server_single_<%=os_version%>
     provisioner:
       pillars-from-files:
         heat.sls: tests/pillar/server_single.sls