diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index 00b8e9d..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-suites:
-
-  - name: <%= ENV['SUITE'] %>
-    provisioner:
-      pillars-from-files:
-        backupninja.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.travis.yml b/.travis.yml
index e7f6583..fac5c1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,21 +17,22 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=server_rdiff
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=server_rdiff
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=client_rsync
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=client_rsync
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=client_s3
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=client_s3
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=client_webdav
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=client_webdav
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=server-rdiff
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=server-rdiff
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=client-rsync
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=client-rsync
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=client-s3
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=client-s3
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=client-webdav
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=client-webdav
 
 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: