diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index e543e5b..d718671 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -27,11 +27,12 @@
       virtual_host: '/openstack'
       # Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715
       rpc_thread_pool_size: 5
-      database:
-        engine: mysql
-        host: 127.0.0.1
-        port: 3306
-        name: aodh
-        user: aodh
-        password: test
-
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: aodh
+      user: aodh
+      password: test
+    notifications:
+      store_events: default
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index 395a110..033bd64 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -19,14 +19,16 @@
     message_queue:
       engine: rabbitmq
       host: 127.0.0.1
+      port: 5672
       user: openstack
       password: password
       virtual_host: '/openstack'
     database:
-        engine: mysql
-        host: 127.0.0.1
-        port: 3306
-        name: aodh
-        user: aodh
-        password: test
-
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: aodh
+      user: aodh
+      password: test
+    notifications:
+      store_events: default