diff --git a/.kitchen.yml b/.kitchen.yml
index 4992d02..3fe2478 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,22 +18,36 @@
     - name: linux
       repo: git
       source: https://github.com/salt-formulas/salt-formula-linux
-    - name: keystone
-      repo: git
-      source: https://github.com/salt-formulas/salt-formula-keystone
   state_top:
     base:
       "*":
         - linux.system
         - aodh
   pillars:
+    release.sls:
+      aodh:
+        server:
+          version: <%= ENV['OS_VERSION'] || 'pike' %>
+    ssl.sls:
+      aodh:
+        server:
+          identity:
+            protocol: https
+          database:
+            ssl:
+              enabled: True
+          message_queue:
+            port: 5671
+            ssl:
+              enabled: True
     top.sls:
       base:
         "*":
           - linux_repo_openstack
           - aodh
+          - release
   pillars-from-files:
-    linux_repo_openstack.sls: tests/pillar/repo_mos9.sls
+    linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'pike' %>.sls
 
 verifier:
   name: inspec
@@ -56,4 +70,31 @@
     provisioner:
       pillars-from-files:
         aodh.sls: tests/pillar/server_single.sls
+
+  - name: server_cluster_ssl
+    provisioner:
+      pillars-from-files:
+        aodh.sls: tests/pillar/server_cluster.sls
+      pillars:
+        top.sls:
+          base:
+            "*":
+              - linux_repo_openstack
+              - aodh
+              - release
+              - ssl
+
+  - name: server_single_ssl
+    provisioner:
+      pillars-from-files:
+        aodh.sls: tests/pillar/server_single.sls
+      pillars:
+        top.sls:
+          base:
+            "*":
+              - linux_repo_openstack
+              - aodh
+              - release
+              - ssl
+
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125