diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 0a94c8e..b5fc183 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -85,3 +85,7 @@
         port: 11211
       - host: 10.10.10.12
         port: 11211
+apache:
+  server:
+    enabled: true
+    default_mpm: event
\ No newline at end of file
diff --git a/tests/pillar/single.yml b/tests/pillar/single.yml
deleted file mode 100644
index 76fe8c1..0000000
--- a/tests/pillar/single.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-barbican:
-  server:
-    enabled: true
-    bind:
-      address: 0.0.0.0
diff --git a/tests/pillar/ssl.sls b/tests/pillar/ssl.sls
index a7e6d33..4a067f5 100644
--- a/tests/pillar/ssl.sls
+++ b/tests/pillar/ssl.sls
@@ -1,9 +1,84 @@
-include:
-  - .control_single
-
 barbican:
   server:
+    enabled: true
+    version: ocata
+    host_href: ''
+    is_proxied: true
+    dogtag_admin_cert:
+      engine: manual
+      key: 'some dogtag key'
+    plugin:
+      simple_crypto:
+        kek: "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY="
+      p11_crypto:
+        library_path: '/usr/lib/libCryptoki2_64.so'
+        login: 'mypassword'
+        mkek_label: 'an_mkek'
+        mkek_length: 32
+        hmac_label: 'my_hmac_label'
+      kmip:
+        username: 'admin'
+        password: 'password'
+        host: localhost
+        port: 5696
+        keyfile: '/path/to/certs/cert.key'
+        certfile: '/path/to/certs/cert.crt'
+        ca_certs: '/path/to/certs/LocalCA.crt'
+      dogtag:
+        pem_path: '/etc/barbican/kra_admin_cert.pem'
+        dogtag_host: localhost
+        dogtag_port: 8443
+        nss_db_path: '/etc/barbican/alias'
+        nss_db_path_ca: '/etc/barbican/alias-ca'
+        nss_password: 'password123'
+        simple_cmc_profile: 'caOtherCert'
+        ca_expiration_time: 1
+        plugin_working_dir: '/etc/barbican/dogtag'
+    store:
+      software:
+        crypto_plugin: simple_crypto
+        store_plugin: store_crypto
+        global_default: True
+      kmip:
+        store_plugin: kmip_plugin
+      dogtag:
+        store_plugin: dogtag_crypto
+      pkcs11:
+        store_plugin: store_crypto
+        crypto_plugin: p11_crypto
+    database:
+      engine: "mysql+pymysql"
+      host: 10.0.106.20
+      port: 3306
+      name: barbican
+      user: barbican
+      password: password
+      ssl:
+        enabled: True
+    bind:
+      address: 10.0.106.20
+      port: 9311
+      admin_port: 9312
+    identity:
+      engine: keystone
+      host: 10.0.106.20
+      port: 35357
+      domain: default
+      tenant: service
+      user: barbican
+      password: password
     message_queue:
+      engine: rabbitmq
+      user: openstack
+      password: password
+      virtual_host: '/openstack'
+      members:
+      - host: 10.10.10.10
+        port: 5672
+      - host: 10.10.10.11
+        port: 5672
+      - host: 10.10.10.12
+        port: 5672
       port: 5671
       ssl:
         # Case #1: specify cacert file and ca cert body explicitly
@@ -44,7 +119,11 @@
             V0MAVuww51/1DqirRG6Ge/3Sw44eDZID22jjCwLrDH0GSX76cDTe6Bx/WS0Wg7y/
             /86PB1o=
             -----END CERTIFICATE-----
-    database:
-      # Case #2: use defaults - system wide installed CA certs
-      ssl:
-        enabled: True
+    cache:
+      members:
+      - host: 10.10.10.10
+        port: 11211
+      - host: 10.10.10.11
+        port: 11211
+      - host: 10.10.10.12
+        port: 11211