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 6c2e5a4..8441ac3 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -37,9 +37,24 @@
 
 suites:
 
-  - name: <%=ENV['JDK'] || 'openjdk'%>-<%=ENV['JAVA_VERSION'] || '8'%>
+  - name: openjdk-7
     provisioner:
       pillars-from-files:
-        java.sls: tests/pillar/<%=ENV['JDK'] || 'openjdk'%>-<%=ENV['JAVA_VERSION'] || '8'%>.sls
+        java.sls: tests/pillar/openjdk-7.sls
+
+  - name: openjdk-8
+    provisioner:
+      pillars-from-files:
+        java.sls: tests/pillar/openjdk-8.sls
+
+  - name: oracle-jdk-7
+    provisioner:
+      pillars-from-files:
+        java.sls: tests/pillar/oracle-jdk-7.sls
+
+  - name: oracle-jdk-8
+    provisioner:
+      pillars-from-files:
+        java.sls: tests/pillar/oracle-jdk-8.sls
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index fea2f20..f3496bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,17 +17,17 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty JDK=openjdk JAVA_VERSION=7
-    - PLATFORM=trevorj/salty-whales:trusty JDK=oracle-jdk JAVA_VERSION=7
-    - PLATFORM=trevorj/salty-whales:xenial JDK=openjdk JAVA_VERSION=8
-    - PLATFORM=trevorj/salty-whales:xenial JDK=oracle-jdk JAVA_VERSION=8
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=openjdk-7
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=oracle-jdk-7
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=openjdk-8
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=oracle-jdk-8
 
 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: