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