diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
new file mode 100644
index 0000000..f847543
--- /dev/null
+++ b/.kitchen.travis.yml
@@ -0,0 +1,6 @@
+suites:
+
+  - name: <%= ENV['SUITE'] %>
+    provisioner:
+      pillars-from-files:
+        neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.travis.yml b/.travis.yml
index 4f34af2..79c2532 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,16 +17,23 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
-
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=class_mapping
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=class_mapping
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=generate_multi
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=generate_multi
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=generate_single
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=generate_single
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=storage_local
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=storage_local
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=storage_nodes_uri
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=storage_nodes_uri
 
 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: