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 748722d..2ddf9a7 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -37,9 +37,9 @@
 
 suites:
 
-  - name: <%=ENV['SUITE'] || 'apache_server_php7'%>
+  - name: apache_server_<%=ENV['PHP_VERSION'] || 'php7'%>
     provisioner:
       pillars-from-files:
-        apache.sls: tests/pillar/<%=ENV['SUITE'] || 'apache_server_php7'%>.sls
+        apache.sls: tests/pillar/apache_server_<%=ENV['PHP_VERSION'] || 'php7'%>.sls
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
index 4daa25c..9cb9872 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,8 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=apache_server_php5
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=apache_server_php7
+    - PLATFORM=trevorj/salty-whales:trusty PHP_VERSION=php5
+    - PLATFORM=trevorj/salty-whales:xenial PHP_VERSION=php7
 
 
 before_script: