diff --git a/tests/pillar/master_acl.sls b/tests/pillar/master_acl.sls
new file mode 100644
index 0000000..d457f5c
--- /dev/null
+++ b/tests/pillar/master_acl.sls
@@ -0,0 +1,24 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
+salt:
+  master:
+    enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
+    user:
+      peter:
+        enabled: true
+        permissions:
+        - 'fs.fs'
+        - 'fs.\*'
diff --git a/tests/pillar/master_api.sls b/tests/pillar/master_api.sls
new file mode 100644
index 0000000..b5bd653
--- /dev/null
+++ b/tests/pillar/master_api.sls
@@ -0,0 +1,25 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
+salt:
+  master:
+    enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
+  api:
+    enabled: true
+    ssl:
+      engine: salt
+    bind:
+      address: 0.0.0.0
+      port: 8000
diff --git a/tests/pillar/master_cluster_failover.sls b/tests/pillar/master_cluster_failover.sls
index e69de29..88229a0 100644
--- a/tests/pillar/master_cluster_failover.sls
+++ b/tests/pillar/master_cluster_failover.sls
@@ -0,0 +1,18 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
+salt:
+  master:
+    enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
\ No newline at end of file
diff --git a/tests/pillar/master_custom_handler.sls b/tests/pillar/master_custom_handler.sls
new file mode 100644
index 0000000..80abf33
--- /dev/null
+++ b/tests/pillar/master_custom_handler.sls
@@ -0,0 +1,24 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
+salt:
+  master:
+    enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
+    handler:
+      handler01:
+        engine: udp
+        bind:
+          host: 127.0.0.1
+          port: 9999
diff --git a/tests/pillar/master_ssh_minion_key.sls b/tests/pillar/master_ssh_minion_key.sls
index 92ead37..09e007e 100644
--- a/tests/pillar/master_ssh_minion_key.sls
+++ b/tests/pillar/master_ssh_minion_key.sls
@@ -1,6 +1,21 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
 salt:
   master:
     enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
     ssh_minion:
       node01:
         host: 10.0.0.1
diff --git a/tests/pillar/master_ssh_minion_password.sls b/tests/pillar/master_ssh_minion_password.sls
index e3c9c82..2883f4d 100644
--- a/tests/pillar/master_ssh_minion_password.sls
+++ b/tests/pillar/master_ssh_minion_password.sls
@@ -1,6 +1,21 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
 salt:
   master:
     enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
     ssh_minion:
       node01:
         host: 10.0.0.1
diff --git a/tests/pillar/master_ssh_minion_root.sls b/tests/pillar/master_ssh_minion_root.sls
index 2e72678..b076fbc 100644
--- a/tests/pillar/master_ssh_minion_root.sls
+++ b/tests/pillar/master_ssh_minion_root.sls
@@ -1,6 +1,21 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
 salt:
   master:
     enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
     ssh_minion:
       node01:
         host: 10.0.0.1
diff --git a/tests/pillar/minion_custom_handler.sls b/tests/pillar/minion_custom_handler.sls
new file mode 100644
index 0000000..6c30c48
--- /dev/null
+++ b/tests/pillar/minion_custom_handler.sls
@@ -0,0 +1,14 @@
+salt:
+  minion:
+    enabled: true
+    handler:
+      handler01:
+        engine: udp
+        bind:
+          host: 127.0.0.1
+          port: 9999
+      handler02:
+        engine: zmq
+        bind:
+          host: 127.0.0.1
+          port: 9999
\ No newline at end of file
diff --git a/tests/pillar/master_base.sls b/tests/pillar/salt_master_peer.sls
similarity index 100%
rename from tests/pillar/master_base.sls
rename to tests/pillar/salt_master_peer.sls