diff --git a/.kitchen.yml b/.kitchen.yml
index bb78fa4..fec26e7 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -75,6 +75,16 @@
             server:
               version: <%= ENV['OS_VERSION'] || 'pike' %>
 
+  - name: server_gnocchi_cluster
+    provisioner:
+      pillars-from-files:
+        ceilometer.sls: tests/pillar/server_gnocchi_cluster.sls
+      pillars:
+        release.sls:
+          ceilometer:
+            server:
+              version: <%= ENV['OS_VERSION'] || 'pike' %>
+
   - name: server_single
     provisioner:
       pillars-from-files:
@@ -111,6 +121,32 @@
               - release
               - ssl
 
+  - name: server_gnocchi_cluster_ssl
+    provisioner:
+      pillars-from-files:
+        ceilometer.sls: tests/pillar/server_gnocchi_cluster.sls
+      pillars:
+        release.sls:
+          ceilometer:
+            server:
+              version: <%= ENV['OS_VERSION'] || 'pike' %>
+        ssl.sls:
+          ceilometer:
+            server:
+              identity:
+                protocol: https
+              message_queue:
+                port: 5671
+                ssl:
+                  enabled: True
+        top.sls:
+          base:
+            "*":
+              - linux_repo_openstack
+              - ceilometer
+              - release
+              - ssl
+
   - name: agent_cluster_ssl
     provisioner:
       pillars-from-files: