diff --git a/tests/pillar/agent_cluster.sls b/tests/pillar/agent_cluster.sls
index 9e7ae5c..a072236 100644
--- a/tests/pillar/agent_cluster.sls
+++ b/tests/pillar/agent_cluster.sls
@@ -16,8 +16,13 @@
       endpoint_type: internalURL
     message_queue:
       engine: rabbitmq
-      host: 127.0.0.1
-      port: 5672
+      members:
+      - host: 127.0.0.1
+        port: 5672
+      - host: 127.0.0.1
+        port: 5672
+      - host: 127.0.0.1
+        port: 5672
       user: openstack
       password: ${_param:rabbitmq_openstack_password}
       virtual_host: '/openstack'
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 2cd6eb4..0723a4d 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -23,22 +23,31 @@
       engine: rabbitmq
       members:
       - host: 127.0.0.1
+        port: 5672
       - host: 127.0.0.1
+        port: 5672
       - 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
     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
+      engine: influxdb
+      influxdb:
+        members:
+        - host: 127.0.0.1
+          port: 8086
+        - host: 127.0.0.1
+          port: 8086
+        - host: 127.0.0.1
+          port: 8086
+        name: ceilometer
+        user: ceilometer
+        password: password
+        database: database
+      elasticsearch:
+        enabled: true
+        host: 127.0.0.1
+        port: 8086
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index 1b75393..444c399 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -29,9 +29,15 @@
       # 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
+      engine: influxdb
+      influxdb:
+        host: 127.0.0.1
+        port: 8086
+        name: ceilometer
+        user: ceilometer
+        password: password
+        database: database
+      elasticsearch:
+        enabled: true
+        host: 127.0.0.1
+        port: 8086