diff --git a/tests/pillar/agent_cluster.sls b/tests/pillar/agent_cluster.sls
new file mode 100644
index 0000000..a3e9d4c
--- /dev/null
+++ b/tests/pillar/agent_cluster.sls
@@ -0,0 +1,24 @@
+ceilometer:
+  agent:
+    enabled: true
+    version: liberty
+    secret: password
+    publisher:
+      default:
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: ceilometer
+      password: password
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: ${_param:rabbitmq_openstack_password}
+      virtual_host: '/openstack'
+      ha_queues: true
+      # Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715
+      rpc_thread_pool_size: 5
diff --git a/tests/pillar/agent_single.sls b/tests/pillar/agent_single.sls
new file mode 100644
index 0000000..a4e54de
--- /dev/null
+++ b/tests/pillar/agent_single.sls
@@ -0,0 +1,23 @@
+ceilometer:
+  agent:
+    enabled: true
+    version: liberty
+    secret: password
+    publisher:
+      default:
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: ceilometer
+      password: password
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: password
+      virtual_host: '/openstack'
+      # Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715
+      rpc_thread_pool_size: 5
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
new file mode 100644
index 0000000..b273bd3
--- /dev/null
+++ b/tests/pillar/server_cluster.sls
@@ -0,0 +1,41 @@
+ceilometer:
+  server:
+    enabled: true
+    version: liberty
+    cluster: true
+    secret: password
+    ttl: 86400
+    publisher:
+      default:
+    bind:
+      host: 127.0.0.1
+      port: 8777
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: ceilometer
+      password: password
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: password
+      virtual_host: '/openstack'
+      ha_queues: true
+      # Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715
+      rpc_thread_pool_size: 5
+    database:
+      engine: mongodb
+      members:
+      - host: 127.0.0.1
+        port: 27017
+      - host: 127.0.0.1
+        port: 27017
+      - host: 127.0.0.1
+        port: 27017
+      name: ceilometer
+      user: ceilometer
+      password: password
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
new file mode 100644
index 0000000..201f3d1
--- /dev/null
+++ b/tests/pillar/server_single.sls
@@ -0,0 +1,35 @@
+ceilometer:
+  server:
+    enabled: true
+    version: liberty
+    secret: password
+    ttl: 86400
+    publisher:
+      default:
+    bind:
+      host: 127.0.0.1
+      port: 8777
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: ceilometer
+      password: password
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: password
+      virtual_host: '/openstack'
+      ha_queues: true
+      # Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715
+      rpc_thread_pool_size: 5
+    database:
+      engine: mongodb
+      host: 127.0.0.1
+      port: 27017
+      name: ceilometer
+      user: ceilometer
+      password: password