diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index 8d7138e..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-suites:
-
-  - name: <%= ENV['SUITE'] %>
-    provisioner:
-      pillars-from-files:
-        heat.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.travis.yml b/.travis.yml
index 79f6159..e13a3ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,12 +17,12 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=server_cluster
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=server_cluster
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=server_plugin_dirs
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=server_plugin_dirs
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=server_single
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=server_single
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=server-cluster
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=server-cluster
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=server-plugin-dirs
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=server-plugin-dirs
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=server-single
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=server-single
 
 
 before_script:
@@ -30,7 +30,8 @@
   - 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: