diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index 82923c2..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-suites:
-
-  - name: <%= ENV['SUITE'] %>
-    provisioner:
-      pillars-from-files:
-        haproxy.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.travis.yml b/.travis.yml
index 77b9e3c..9846a72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,12 +19,12 @@
 env:
     - PLATFORM=trevorj/salty-whales:trusty SUITE=admin
     - PLATFORM=trevorj/salty-whales:xenial SUITE=admin
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=single_contrail
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=single_contrail
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=single_general_service
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=single_general_service
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=single_openstack_service
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=single_openstack_service
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=single-contrail
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=single-contrail
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=single-general-service
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=single-general-service
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=single-openstack-service
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=single-openstack-service
     - PLATFORM=trevorj/salty-whales:trusty SUITE=stats
     - PLATFORM=trevorj/salty-whales:xenial SUITE=stats
 
@@ -33,7 +33,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: