diff --git a/.travis.yml b/.travis.yml
index 7a77247..2e36211 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,15 +17,19 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=client
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=client
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=cluster
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=cluster
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=single
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=single
 
 before_script:
   - set -o pipefail
   - make test | tail
 
 script:
-  - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
+  - KITCHEN_LOCAL_YAML=.kitchen.travis.yml bundle exec kitchen test -t tests/integration
 
 notifications:
   webhooks: