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/.kitchen.yml b/.kitchen.yml
index 576130e..ff1894d 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -37,14 +37,30 @@
   sudo: true
 
 platforms:
-  - name: ubuntu-xenial
+  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
     driver_config:
-      image: trevorj/salty-whales:xenial
+      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
       platform: ubuntu
 
 suites:
-  - name: <%=ENV['SUITE'] || 'single'%>
+  - name: single
     provisioner:
       pillars-from-files:
-        elasticsearch.sls: tests/pillar/<%=ENV['SUITE'] || 'single'%>.sls
+        elasticsearch.sls: tests/pillar/single.sls
+
+  - name: cluster
+    provisioner:
+      pillars-from-files:
+        elasticsearch.sls: tests/pillar/cluster.sls
+
+  - name: curator
+    provisioner:
+      pillars-from-files:
+        elasticsearch.sls: tests/pillar/curator.sls
+
+  - name: client
+    provisioner:
+      pillars-from-files:
+        elasticsearch.sls: tests/pillar/client.sls
+
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
index 6385840..0b7cfbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,17 +17,17 @@
   - bundle install
 
 env:
-    - SUITE='single'
-    - SUITE='cluster'
-    - SUITE='curator'
-    - SUITE='client'
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=single
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=cluster
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=curator
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=client
 
 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: