diff --git a/tests/pillar/agent_cluster.sls b/tests/pillar/agent_cluster.sls
index 46f3401..75d87ab 100644
--- a/tests/pillar/agent_cluster.sls
+++ b/tests/pillar/agent_cluster.sls
@@ -1,5 +1,16 @@
 ceilometer:
   agent:
+    polling:
+      sources:
+        my_pollsters:
+          meters:
+            - "test_meter1"
+            - "regex_meters*"
+          interval: 30
+        all_pollsters:
+          meters:
+            - "*"
+          interval: 100
     debug: true
     region: RegionOne
     enabled: true
@@ -7,6 +18,7 @@
     secret: password
     publisher:
       default:
+        enabled: true
     identity:
       engine: keystone
       host: 127.0.0.1
diff --git a/tests/pillar/agent_single.sls b/tests/pillar/agent_single.sls
index 4072fd4..300e747 100644
--- a/tests/pillar/agent_single.sls
+++ b/tests/pillar/agent_single.sls
@@ -7,6 +7,7 @@
     secret: password
     publisher:
       default:
+        enabled: true
     identity:
       engine: keystone
       host: 127.0.0.1
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 93f4d02..7a6c50d 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -9,6 +9,7 @@
     ttl: 86400
     publisher:
       default:
+        enabled: true
     bind:
       host: 127.0.0.1
       port: 8777
diff --git a/tests/pillar/server_gnocchi_cluster.sls b/tests/pillar/server_gnocchi_cluster.sls
new file mode 100644
index 0000000..9cdbc31
--- /dev/null
+++ b/tests/pillar/server_gnocchi_cluster.sls
@@ -0,0 +1,45 @@
+ceilometer:
+  server:
+    debug: true
+    region: RegionOne
+    enabled: true
+    version: pike
+    cluster: true
+    secret: password
+    ttl: 86400
+    publisher:
+      default:
+        enabled: false
+      gnocchi:
+        enabled: true
+        url: gnocchi://
+        publish_metric: true
+        archive_policy: high
+        filter_project: project
+        create_resources: true
+        resources_definition_file: gnocchi_resources.yaml
+        request_timeout: 11.0
+    bind:
+      host: 127.0.0.1
+      port: 8777
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: ceilometer
+      password: password
+      endpoint_type: internalURL
+    message_queue:
+      engine: rabbitmq
+      members:
+      - host: 127.0.0.1
+      - host: 127.0.0.1
+      - host: 127.0.0.1
+      user: openstack
+      password: password
+      virtual_host: '/openstack'
+      # Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715
+      rpc_thread_pool_size: 5
+    database:
+      engine: gnocchi
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index f2fa5c4..26f5653 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -8,6 +8,7 @@
     ttl: 86400
     publisher:
       default:
+        enabled: true
     bind:
       host: 127.0.0.1
       port: 8777