diff --git a/.kitchen.yml b/.kitchen.yml
index 06bfd00..bf95612 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -29,65 +29,21 @@
   sudo: true
 
 platforms:
-  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
+  - name: ubuntu-trusty
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
+      image: trevorj/salty-whales:trusty
+      platform: ubuntu
+
+  - name: ubuntu-xenial
+    driver_config:
+      image: trevorj/salty-whales:xenial
       platform: ubuntu
 
 suites:
 
-  - name: ceph_single
+  - name: <%=ENV['SUITE'] || 'ceph_single'%>
     provisioner:
       pillars-from-files:
-        cinder.sls: tests/pillar/ceph_single.sls
+        cinder.sls: tests/pillar/<%=ENV['SUITE'] || 'ceph_single'%>.sls
 
-  - name: control_cluster
-    provisioner:
-      pillars-from-files:
-        cinder.sls: tests/pillar/control_cluster.sls
-
-  - name: control_single
-    provisioner:
-      pillars-from-files:
-        cinder.sls: tests/pillar/control_single.sls
-
-  - name: eternus_single
-    provisioner:
-      pillars-from-files:
-        cinder.sls: tests/pillar/eternus_single.sls
-
-  - name: gpfs_single
-    provisioner:
-      pillars-from-files:
-        cinder.sls: tests/pillar/gpfs_single.sls
-
-  - name: hp3par_single
-    provisioner:
-      pillars-from-files:
-        cinder.sls: tests/pillar/hp3par_single.sls
-
-  - name: lefthand_single
-    provisioner:
-      pillars-from-files:
-        cinder.sls: tests/pillar/lefthand_single.sls
-
-  - name: solidfire_single
-    provisioner:
-      pillars-from-files:
-        cinder.sls: tests/pillar/solidfire_single.sls
-
-  - name: storwize_single
-    provisioner:
-      pillars-from-files:
-        cinder.sls: tests/pillar/storwize_single.sls
-
-  - name: volume_single
-    provisioner:
-      pillars-from-files:
-        cinder.sls: tests/pillar/volume_single.sls
-
-  - name: vsp_single
-    provisioner:
-      pillars-from-files:
-        cinder.sls: tests/pillar/vsp_single.sls
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
index 4f34af2..c1872fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,16 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
-
+    - SUITE=ceph_single
+    - SUITE=control_cluster
+    - SUITE=control_single
+    - SUITE=gpfs_single
+    - SUITE=hp3par_single
+    - SUITE=lefthand_single
+    - SUITE=solidfire_single
+    - SUITE=storwize_single
+    - SUITE=volume_single
+    - SUITE=vsp_single
 
 before_script:
   - set -o pipefail