diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index 645a273..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-suites:
-
-  - name: <%= ENV['SUITE'] %>
-    provisioner:
-      pillars-from-files:
-        <%# to parse SUITE=kubernetes:pillar1,kubernetes_extra:pillar2 %>
-        <%- ENV['SUITE'].split(',').each |suite| %>
-        <%- set suite = [suite.split(':')].flatten %>
-        <%- if suite.length > 1 %>
-          <%- set key=suite[0] %>
-          <%- set file=suite[1] %>
-        <%- else %>
-          <%- set key='kubernetes' %>
-          <%- set file=suite[0] %>
-        <%- end %>
-        <%= key %>.sls: tests/pillar/<%= file %>.sls
-        <%- end %>
diff --git a/.travis.yml b/.travis.yml
index 95434f9..afbeca7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,24 +18,25 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=master_cluster
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=master_cluster
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=pool_cluster
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=pool_cluster
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=master_contrail
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=master_contrail
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=master_contrail4_0
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=master_contrail4_0
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=pool_contrail4_0
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=pool_contrail4_0
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=common_storageclass
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=master-cluster
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=master-cluster
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=pool-cluster
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=pool-cluster
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=master-contrail
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=master-contrail
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=master-contrail4-0
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=master-contrail4-0
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=pool-contrail4-0
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=pool-contrail4-0
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=common-storageclass
 
 before_script:
   - set -o pipefail
   - make test | tail
 
 script:
-  - KITCHEN_LOCAL_YAML=.kitchen.travis.yml bundle exec kitchen test -t tests/integration
+  - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
+  - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
 
 notifications:
   webhooks: