diff --git a/metadata/service/minion/cluster.yml b/metadata/service/minion/cluster.yml
index c578635..2bc0513 100644
--- a/metadata/service/minion/cluster.yml
+++ b/metadata/service/minion/cluster.yml
@@ -6,8 +6,9 @@
   salt:
     minion:
       enabled: true
-      master:
-        host: ${_param:salt_master_host}
+      masters:
+        - host: ${_param:salt_master_host}
+        - host: ${_param:salt_master_host}
       mine:
         interval: 60
         module:
diff --git a/tests/pillar/minion_pki_cert.sls b/tests/pillar/minion_pki_cert.sls
deleted file mode 100644
index 028742f..0000000
--- a/tests/pillar/minion_pki_cert.sls
+++ /dev/null
@@ -1,20 +0,0 @@
-salt:
-  minion:
-    enabled: true
-    cert:
-      test_server:
-        host: minion.with.ca
-        signing_policy: cert_server
-        authority: Company CA
-        common_name: test.server.domain.tld
-        alternative_names: DNS:www1.server.domain.tld,DNS:www2.server.domain.tld,IP:1.2.3.4,IP:2.3.4.5
-      test_client:
-        host: minion.with.ca
-        signing_policy: cert_client
-        authority: Company CA
-        common_name: test.client.domain.tld
-      test_edge_ca:
-        host: minion.with.ca
-        signing_policy: ca_edge
-        authority: Company CA
-        common_name: test.ca.domain.tld
\ No newline at end of file