diff --git a/.gitignore b/.gitignore
index aa8e42a..c9434e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 *.swp
 *.pyc
 .ropeproject
+.kitchen
+.bundle
+.vendor
diff --git a/.kitchen.yml b/.kitchen.yml
index e810fe5..9971582 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -28,21 +28,11 @@
   name: inspec
   sudo: true
 
-# platforms:
-#   - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
-#     driver_config:
-#       image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
-#       platform: ubuntu
 
 platforms:
-  - name: ubuntu-trusty
+  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
     driver_config:
-      image: trevorj/salty-whales:trusty
-      platform: ubuntu
-
-  - name: ubuntu-xenial
-    driver_config:
-      image: trevorj/salty-whales:xenial
+      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
       platform: ubuntu
 
 suites:
@@ -51,4 +41,9 @@
     provisioner:
       pillars-from-files:
         rsyslog.sls: tests/pillar/client_single.sls
+
+  - name: server_single
+    provisioner:
+      pillars-from-files:
+        rsyslog.sls: tests/pillar/server_single.sls
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/tests/pillar/server.sls b/tests/pillar/server_single.sls
similarity index 100%
rename from tests/pillar/server.sls
rename to tests/pillar/server_single.sls