diff --git a/.kitchen.yml b/.kitchen.yml
index 0e21280..8ab6095 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,9 +18,6 @@
     - name: linux
       repo: git
       source: https://github.com/salt-formulas/salt-formula-linux
-    - name: mysql
-      repo: git
-      source: https://github.com/salt-formulas/salt-formula-mysql
     - name: apache
       repo: git
       source: https://github.com/salt-formulas/salt-formula-apache
@@ -33,22 +30,67 @@
     - name: rabbitmq
       repo: git
       source: https://github.com/salt-formulas/salt-formula-rabbitmq
+    - name: oslo_templates
+      repo: git
+      source: https://github.com/salt-formulas/salt-formula-oslo-templates
   state_top:
     base:
       "*":
         - linux
-        - mysql
         - keystone
   pillars:
+    release.sls:
+      keystone:
+        server:
+          version: <%= ENV['OS_VERSION'] || 'pike' %>
+    ssl.sls:
+      keystone:
+        server:
+          identity:
+            protocol: https
+          database:
+            x509:
+              enabled: True
+              ca_file: /etc/keystone/ssl/mysql/ca-cert.pem
+              key_file: /etc/keystone/ssl/mysql/client-key.pem
+              cert_file: /etc/keystone/ssl/mysql/client-cert.pem
+              cacert: |
+                -----BEGIN CERTIFICATE-----
+                MIIFzzCCA7egAwIBAgIIe7zZ8hCvkgowDQYJKoZIhvcNAQELBQAwSjELMAkGA1UE
+                -----END CERTIFICATE-----
+              cert: |
+                -----BEGIN CERTIFICATE-----
+                MIIGSjCCBDKgAwIBAgIJAIHRPs2rZbLvMA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNV
+                -----END CERTIFICATE-----
+              key: |
+                -----BEGIN RSA PRIVATE KEY-----
+                MIIJKQIBAAKCAgEAq0m4kOIITliYea07yJnlSRNY0o6NaykiteSfHGauiub4lNQJ
+                -----END RSA PRIVATE KEY-----
+            ssl:
+              enabled: True
+              cacert_file: /etc/keystone/ssl/mysql/ca-cert.pem
+              cacert: |
+                -----BEGIN CERTIFICATE-----
+                MIIFzzCCA7egAwIBAgIIe7zZ8hCvkgowDQYJKoZIhvcNAQELBQAwSjELMAkGA1UE
+                -----END CERTIFICATE-----
+          message_queue:
+            port: 5671
+            ssl:
+              enabled: True
+              cacert_file: /etc/keystone/ssl/mysql/ca-cert.pem
+              cacert: |
+                -----BEGIN CERTIFICATE-----
+                MIIFzzCCA7egAwIBAgIIe7zZ8hCvkgowDQYJKoZIhvcNAQELBQAwSjELMAkGA1UE
+                -----END CERTIFICATE-----
+
     top.sls:
       base:
         "*":
           - linux_repo_openstack
           - keystone
-          - mysql_platform_specific
-    mysql_platform_specific.sls: {}
+          - 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
@@ -59,13 +101,6 @@
     driver_config:
       image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
-    provisioner:
-      pillars:
-        mysql_platform_specific.sls:
-          mysql:
-            server:
-              # workaround, formula not yet handle platform default version
-              version: "<%=ENV['MYSQL_VERSION'] || '5.7'%>"
 
 suites:
 
@@ -73,16 +108,43 @@
     provisioner:
       pillars-from-files:
         keystone.sls: tests/pillar/single.sls
+    verifier:
+      inspec_tests:
+        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/single
+
+  - name: single_ssl
+    provisioner:
+      pillars-from-files:
+        keystone.sls: tests/pillar/single.sls
+      pillars:
+        top.sls:
+          base:
+            "*":
+              - linux_repo_openstack
+              - keystone
+              - release
+              - ssl
+    verifier:
+      inspec_tests:
+        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/single
+      attributes:
+        ssl: true
 
   - name: single_domain
     provisioner:
       pillars-from-files:
         keystone.sls: tests/pillar/single_domain.sls
+    verifier:
+      inspec_tests:
+        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/single_domain
 
   - name: single_fernet
     provisioner:
       pillars-from-files:
         keystone.sls: tests/pillar/single_fernet.sls
+    verifier:
+      inspec_tests:
+        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/single_fernet
 
   - name: under-apache
     provisioner:
@@ -95,5 +157,8 @@
             - mysql
             - apache
             - keystone
+    verifier:
+      inspec_tests:
+        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/under-apache
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125