diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index 2d5e772..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-suites:
-
-  - name: <%= ENV['SUITE'] %>
-    provisioner:
-      pillars-from-files:
-        glance.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.travis.yml b/.travis.yml
index 8721b7f..1a41dc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,10 +19,10 @@
 env:
     - PLATFORM=trevorj/salty-whales:trusty SUITE=cluster
     - PLATFORM=trevorj/salty-whales:xenial SUITE=cluster
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=single_ceph
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=single_ceph
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=single_barbican
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=single_barbican
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=single-ceph
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=single-ceph
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=single-barbican
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=single-barbican
     - PLATFORM=trevorj/salty-whales:trusty SUITE=single
     - PLATFORM=trevorj/salty-whales:xenial SUITE=single
 
@@ -31,7 +31,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: