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