diff --git a/.kitchen.yml b/.kitchen.yml
index 0eb127a..2f7b82b 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -41,23 +41,23 @@
 
 suites:
 
-  - name: rdiff
+  - name: server_rdiff
     provisioner:
       pillars-from-files:
-        backupninja.sls: tests/pillar/rdiff.sls
+        backupninja.sls: tests/pillar/server_rdiff.sls
 
-  - name: rsync
+  - name: client_rsync
     provisioner:
       pillars-from-files:
-        backupninja.sls: tests/pillar/rsync.sls
+        backupninja.sls: tests/pillar/client_rsync.sls
 
-  - name: s3
+  - name: client_s3
     provisioner:
       pillars-from-files:
-        backupninja.sls: tests/pillar/s3.sls
+        backupninja.sls: tests/pillar/client_s3.sls
 
-  - name: webdav
+  - name: client_webdav
     provisioner:
       pillars-from-files:
-        backupninja.sls: tests/pillar/webdav.sls
+        backupninja.sls: tests/pillar/client_webdav.sls
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/tests/pillar/rsync.sls b/tests/pillar/client_rsync.sls
similarity index 100%
rename from tests/pillar/rsync.sls
rename to tests/pillar/client_rsync.sls
diff --git a/tests/pillar/s3.sls b/tests/pillar/client_s3.sls
similarity index 100%
rename from tests/pillar/s3.sls
rename to tests/pillar/client_s3.sls
diff --git a/tests/pillar/webdav.sls b/tests/pillar/client_webdav.sls
similarity index 100%
rename from tests/pillar/webdav.sls
rename to tests/pillar/client_webdav.sls
diff --git a/tests/pillar/rdiff.sls b/tests/pillar/server_rdiff.sls
similarity index 100%
rename from tests/pillar/rdiff.sls
rename to tests/pillar/server_rdiff.sls