diff --git a/tests/pillar/client.sls b/tests/pillar/client.sls
new file mode 100644
index 0000000..bf746d9
--- /dev/null
+++ b/tests/pillar/client.sls
@@ -0,0 +1,27 @@
+linux:
+  system:
+    enabled: true
+    user:
+      testusername: &_user
+        enabled: true
+        name: testusername
+        sudo: true
+        uid: 9999
+        full_name: Test User
+        home: /home/testusername
+openssh:
+  client:
+    enabled: true
+    user:
+      testusername:
+        enabled: true
+        # Include from linux.system.user structure
+        user: *_user
+    known_hosts:
+    - name: repo.domain.com
+      type: rsa
+      fingerprint: dd:fa:e8:68:b1:ea:ea:a0:63:f1:5a:55:48:e1:7e:37
+    alive:
+      interval: 600
+      count: 3
+
diff --git a/tests/pillar/openssh_client.sls b/tests/pillar/openssh_client.sls
deleted file mode 100644
index 7915aae..0000000
--- a/tests/pillar/openssh_client.sls
+++ /dev/null
@@ -1,22 +0,0 @@
-openssh:
-  client:
-    enabled: true
-    user:
-      test:
-        enabled: false
-        name: test
-        user: 
-          enabled: true
-          name: test
-          sudo: true
-          uid: 9999
-          full_name: Test User
-          home: /home/test
-    known_hosts:
-    - name: repo.domain.com
-      type: rsa
-      fingerprint: dd:fa:e8:68:b1:ea:ea:a0:63:f1:5a:55:48:e1:7e:37
-    alive:
-      interval: 600
-      count: 3
-
diff --git a/tests/pillar/openssh_server.sls b/tests/pillar/openssh_server.sls
deleted file mode 100644
index 6f321a7..0000000
--- a/tests/pillar/openssh_server.sls
+++ /dev/null
@@ -1,25 +0,0 @@
-openssh:
-  server:
-    enabled: true
-    use_dns: False
-    user:
-      test:
-        enabled: true
-        name: test
-        user:
-          enabled: true
-          name: test
-          sudo: true
-          uid: 9999
-          full_name: Test User
-          home: /home/test
-    public_keys:
-    - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCts9Ry.........
-    bind:
-      address: 0.0.0.0
-      port: 8000
-    force_command: /usr/bin/toilet
-    alive:
-      keep: no
-      interval: 600
-      # count: 3
diff --git a/tests/pillar/server.sls b/tests/pillar/server.sls
new file mode 100644
index 0000000..ccfcbcb
--- /dev/null
+++ b/tests/pillar/server.sls
@@ -0,0 +1,33 @@
+linux:
+  system:
+    enabled: true
+    user:
+      testusername: &_user
+        enabled: true
+        name: testusername
+        sudo: true
+        uid: 9999
+        full_name: Test User
+        home: /home/testusername
+openssh:
+  server:
+    enabled: true
+    use_dns: yes
+    user:
+      testusername:
+        enabled: true
+        public_keys:
+          -
+            key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCts9Ry......... user@example.com"
+          -
+            key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAB667779Ry......... user@example.com"
+        # Include from linux.system.user structure
+        user: *_user
+    bind:
+      address: 0.0.0.0
+      port: 8000
+    force_command: /usr/bin/toilet
+    alive:
+      keep: no
+      interval: 600
+      # count: 3