diff --git a/.kitchen.yml b/.kitchen.yml
index c390b39..c6cb449 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -28,7 +28,6 @@
     top.sls:
       base:
         "*":
-          - linux_repo_openstack
           - linux_repo_opencontrail
           - linux_repo_cassandra
           - linux
@@ -42,7 +41,6 @@
     opencontrail_juniper.sls: {}
   pillars-from-files:
     linux_repo_cassandra.sls: tests/pillar/repo_cassandra.sls
-    linux_repo_openstack.sls: tests/pillar/repo_openstack.sls
 
 verifier:
   name: inspec
@@ -58,86 +56,44 @@
       platform: ubuntu
 
 suites:
-  - name: single3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/single3.sls
-        linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc323.sls
-
-  - name: single40
+  - name: single_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/single40.sls
+        opencontrail.sls: tests/pillar/single.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
 
-  - name: analytics3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/analytics3.sls
-        linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc323.sls
-
-  - name: analytics40
+  - name: analytics_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/analytics40.sls
+        opencontrail.sls: tests/pillar/analytics.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
 
-  - name: control3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/control3.sls
-        linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc323.sls
-
-  - name: control40
+  - name: control_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/control40.sls
+        opencontrail.sls: tests/pillar/control.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
 
-  - name: cluster3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/cluster3.sls
-        linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc323.sls
-
-  - name: cluster40
+  - name: cluster_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/cluster40.sls
+        opencontrail.sls: tests/pillar/cluster.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
 
-  # - name: tor3
-  #   provisioner:
-  #     pillars-from-files:
-  #       opencontrail.sls: tests/pillar/tor3.sls
-  #       linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc323.sls
-
-  # - name: tor40
-  #   provisioner:
-  #     pillars-from-files:
-  #       opencontrail.sls: tests/pillar/tor40.sls
-  #       linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-
-  - name: vrouter3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/vrouter3.sls
-        linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc323.sls
-
-  - name: vrouter40
+  - name: vrouter_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/vrouter40.sls
+        opencontrail.sls: tests/pillar/vrouter.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125