diff --git a/.kitchen.yml b/.kitchen.yml
index 3cb0789..79bda71 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -27,6 +27,23 @@
         - apache
         - barbican
   pillars:
+    barbican_plugins.sls:
+      barbican:
+        server:
+          plugin:
+            vault:
+              schema: https
+              host: localhost
+              port: 8200
+              root_token_id: s.hpamtsbW5vcHFyc3R1dnd4eXo
+              approle_role_id: role_id
+              approle_secret_id: secret_id
+              kv_mountpoint: secret
+              ssl_ca_crt_file: '/etc/barbican/ssl/vault/CA.crt'
+              cacert: |
+                -----BEGIN CERTIFICATE-----
+                MIIF0TCCA7mgAwIBAgIJAOkTQnjLz6rEMA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNV
+                -----END CERTIFICATE-----
     ssl.sls:
       barbican:
         server:
@@ -159,6 +176,15 @@
           barbican:
             server:
               version: <%=os_version%>
+        top.sls:
+          base:
+            "*":
+              - barbican
+              - linux_repo_openstack
+              - release
+              <% unless os_version == 'ocata' || os_version == 'pike' %>
+              - barbican_plugins
+              <% end %>
 
   - name: control_cluster_<%=os_version%>
     provisioner:
@@ -170,6 +196,15 @@
           barbican:
             server:
               version: <%=os_version%>
+        top.sls:
+          base:
+            "*":
+              - barbican
+              - linux_repo_openstack
+              - release
+              <% unless os_version == 'ocata' || os_version == 'pike' %>
+              - barbican_plugins
+              <% end %>
 
   - name: control_single_ssl_<%=os_version%>
     provisioner: