diff --git a/.kitchen.yml b/.kitchen.yml
index d0d8c0d..500aef2 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -48,7 +48,7 @@
 
 suites:
 
-  - name: compute_cluster_<%= ENV['OS_VERSION'] || 'ocata' %>
+  - name: compute_cluster
     provisioner:
       pillars-from-files:
         nova.sls: tests/pillar/compute_cluster.sls
@@ -58,7 +58,7 @@
             compute:
               version: <%= ENV['OS_VERSION'] || 'ocata' %>
 
-  - name: control_cluster_<%= ENV['OS_VERSION'] || 'ocata' %>
+  - name: control_cluster
     provisioner:
       pillars-from-files:
         nova.sls: tests/pillar/control_cluster.sls