diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
new file mode 100644
index 0000000..f847543
--- /dev/null
+++ b/.kitchen.travis.yml
@@ -0,0 +1,6 @@
+suites:
+
+  - name: <%= ENV['SUITE'] %>
+    provisioner:
+      pillars-from-files:
+        neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.kitchen.yml b/.kitchen.yml
index e9ab514..c348a2e 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -2,7 +2,7 @@
 driver:
   name: docker
   hostname: opencontrail
-  use_sudo: true
+  use_sudo: false
 
 provisioner:
   name: salt_solo
@@ -56,29 +56,53 @@
 
 suites:
 
-  # - name: single<%= ENV['OC_VERSION'] || '' %>
+  # - name: single
   #   provisioner:
   #     pillars-from-files:
-  #       opencontrail.sls: tests/pillar/single<%= ENV['OC_VERSION'] || '' %>.sls
-  - name: analytics<%= ENV['OC_VERSION'] || '' %>
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/analytics<%= ENV['OC_VERSION'] || '' %>.sls
-  - name: control<%= ENV['OC_VERSION'] || '' %>
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/control<%= ENV['OC_VERSION'] || '' %>.sls
-  # - name: cluster<%= ENV['OC_VERSION'] || '' %>
+  #       opencontrail.sls: tests/pillar/single.sls
+  # - name: single40
   #   provisioner:
   #     pillars-from-files:
-  #       opencontrail.sls: tests/pillar/cluster<%= ENV['OC_VERSION'] || '' %>.sls
-  # - name: tor<%= ENV['OC_VERSION'] || '' %>
-  #   provisioner:
-  #     pillars-from-files:
-  #       opencontrail.sls: tests/pillar/tor<%= ENV['OC_VERSION'] || '' %>.sls
-  - name: vrouter<%= ENV['OC_VERSION'] || '' %>
+  #       opencontrail.sls: tests/pillar/single40.sls
+  - name: analytics
     provisioner:
       pillars-from-files:
-        opencontrail.sls: tests/pillar/vrouter<%= ENV['OC_VERSION'] || '' %>.sls
+        opencontrail.sls: tests/pillar/analytics.sls
+  - name: analytics40
+    provisioner:
+      pillars-from-files:
+        opencontrail.sls: tests/pillar/analytics40.sls
+  - name: control
+    provisioner:
+      pillars-from-files:
+        opencontrail.sls: tests/pillar/control.sls
+  - name: control40
+    provisioner:
+      pillars-from-files:
+        opencontrail.sls: tests/pillar/control40.sls
+  # - name: cluster
+  #   provisioner:
+  #     pillars-from-files:
+  #       opencontrail.sls: tests/pillar/cluster.sls
+  # - name: cluster40
+  #   provisioner:
+  #     pillars-from-files:
+  #       opencontrail.sls: tests/pillar/cluster40.sls
+  # - name: tor
+  #   provisioner:
+  #     pillars-from-files:
+  #       opencontrail.sls: tests/pillar/tor.sls
+  # - name: tor40
+  #   provisioner:
+  #     pillars-from-files:
+  #       opencontrail.sls: tests/pillar/tor40.sls
+  - name: vrouter
+    provisioner:
+      pillars-from-files:
+        opencontrail.sls: tests/pillar/vrouter.sls
+  - name: vrouter40
+    provisioner:
+      pillars-from-files:
+        opencontrail.sls: tests/pillar/vrouter40.sls
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
index 7ed0bdb..51efa5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,19 +18,43 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:trusty
-  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323
-  - OC_REPO=oc323
-  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 OC_VERSION=4_0
-  - OC_REPO=oc40 OC_VERSION=4_0
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=single
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=analytics
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=control
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=cluster
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=tor
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=vrouter
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=single
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=analytics
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=control
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=cluster
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=tor
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=vrouter
+  # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=single
+  - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=analytics
+  - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=control
+  # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=cluster
+  # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=tor
+  - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=vrouter
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=single40
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=analytics40
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=control40
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=cluster40
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=tor40
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=vrouter40
+  # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=single40
+  - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=analytics40
+  - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=control40
+  # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=cluster40
+  # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=tor40
+  - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=vrouter40
 
 before_script:
   - set -o pipefail
   - make test | tail
 
 script:
-  - test ! -e .kitchen.yml || bundle exec kitchen converge $SUITE || true
-  - test ! -e .kitchen.yml || bundle exec kitchen verify $SUITE -t tests/integration
+  - KITCHEN_LOCAL_YAML=.kitchen.travis.yml bundle exec kitchen test -t tests/integration
 
 notifications:
   webhooks:
diff --git a/tests/pillar/analytics4_0.sls b/tests/pillar/analytics40.sls
similarity index 100%
rename from tests/pillar/analytics4_0.sls
rename to tests/pillar/analytics40.sls
diff --git a/tests/pillar/cluster4_0.sls b/tests/pillar/cluster40.sls
similarity index 100%
rename from tests/pillar/cluster4_0.sls
rename to tests/pillar/cluster40.sls
diff --git a/tests/pillar/control4_0.sls b/tests/pillar/control40.sls
similarity index 100%
rename from tests/pillar/control4_0.sls
rename to tests/pillar/control40.sls
diff --git a/tests/pillar/single4_0.sls b/tests/pillar/single40.sls
similarity index 100%
rename from tests/pillar/single4_0.sls
rename to tests/pillar/single40.sls
diff --git a/tests/pillar/vrouter4_0.sls b/tests/pillar/vrouter40.sls
similarity index 100%
rename from tests/pillar/vrouter4_0.sls
rename to tests/pillar/vrouter40.sls