diff --git a/.kitchen.yml b/.kitchen.yml
index d20ebee..eee6cdf 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -39,10 +39,6 @@
         - linux
         - keystone
   pillars:
-    release.sls:
-      keystone:
-        server:
-          version: <%= ENV['OS_VERSION'] || 'pike' %>
     ssl.sls:
       keystone:
         server:
@@ -116,57 +112,31 @@
       pillars-from-files:
         keystone.sls: tests/pillar/single.sls
         linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      state_top:
+        base:
+          "*":
+            - linux
+            - mysql
+            - apache
+            - keystone
       pillars:
         mysql_platform_specific.sls:
           mysql:
             server:
               version: "<%=mysql_version%>"
+        release.sls:
+            keystone:
+              server:
+                version: <%=os_version%>
+    verifier:
+      inspec_tests:
+        - tests/integration/<%=os_version%>/single
 
   - name: single_ssl_<%=mysql_version%>_<%=os_version%>
     provisioner:
       pillars-from-files:
         keystone.sls: tests/pillar/single.sls
         linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
-      pillars:
-        mysql_platform_specific.sls:
-          mysql:
-            server:
-              version: "<%=mysql_version%>"
-        top.sls:
-          base:
-            "*":
-              - linux_repo_openstack
-              - keystone
-              - release
-              - ssl
-
-  - name: single_domain_<%=mysql_version%>_<%=os_version%>
-    provisioner:
-      pillars-from-files:
-        keystone.sls: tests/pillar/single_domain.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
-      pillars:
-        mysql_platform_specific.sls:
-          mysql:
-            server:
-              version: "<%=mysql_version%>"
-
-  - name: single_fernet_<%=mysql_version%>_<%=os_version%>
-    provisioner:
-      pillars-from-files:
-        keystone.sls: tests/pillar/single_fernet.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
-      pillars:
-        mysql_platform_specific.sls:
-          mysql:
-            server:
-              version: "<%=mysql_version%>"
-
-  - name: under-apache_<%=mysql_version%>_<%=os_version%>
-    provisioner:
-      pillars-from-files:
-        keystone.sls: tests/pillar/apache_wsgi.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       state_top:
         base:
           "*":
@@ -179,6 +149,22 @@
           mysql:
             server:
               version: "<%=mysql_version%>"
+        top.sls:
+          base:
+            "*":
+              - linux_repo_openstack
+              - keystone
+              - release
+              - ssl
+        release.sls:
+            keystone:
+              server:
+                version: <%=os_version%>
+    verifier:
+      inspec_tests:
+        - tests/integration/<%=os_version%>/single
+      attributes:
+        ssl: true
 <% end %>
 <% end %>
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125