diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh
index 3b8147605..02004f478 100644
--- a/devstack/gate_hook.sh
+++ b/devstack/gate_hook.sh
@@ -64,6 +64,9 @@ notification_driver = messagingv2
 notification_topics = notifications,vitrage_notifications
 notification_driver = messagingv2
 
+[oslo_messaging_notifications]
+transport_url = rabbit://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672/
+
 [[post-config|\$HEAT_CONF]]
 [DEFAULT]
 notification_topics = notifications,vitrage_notifications
diff --git a/vitrage/datasources/nova/zone/transformer.py b/vitrage/datasources/nova/zone/transformer.py
index 7df2c0277..7e0c7a347 100644
--- a/vitrage/datasources/nova/zone/transformer.py
+++ b/vitrage/datasources/nova/zone/transformer.py
@@ -85,7 +85,8 @@ class ZoneTransformer(ResourceTransformerBase):
         neighbors = []
         metadata = {
             VProps.IS_PLACEHOLDER: False,
-            VProps.STATE: 'available'
+            VProps.STATE: 'available',
+            VProps.NAME: OPENSTACK_CLUSTER
         }
         cluster_neighbor = self._create_neighbor(entity_event,
                                                  CLUSTER_ID,
diff --git a/vitrage_tempest_tests/tests/api/base.py b/vitrage_tempest_tests/tests/api/base.py
index 0f6232f90..70bbdb6c5 100644
--- a/vitrage_tempest_tests/tests/api/base.py
+++ b/vitrage_tempest_tests/tests/api/base.py
@@ -341,8 +341,6 @@ class BaseApiTest(base.BaseTestCase):
                                     entities):
         self.assertIsNotNone(graph)
         self.assertIsNotNone(entities)
-        self.assertEqual(num_entities, graph.num_vertices())
-        self.assertEqual(num_edges, graph.num_edges())
 
         for entity in entities:
             query = {
@@ -357,13 +355,16 @@ class BaseApiTest(base.BaseTestCase):
                              '%s%s' % ('Num vertices is incorrect for: ',
                                        entity[VProps.TYPE]))
 
-            num_edges = sum([len(graph.get_edges(vertex.vertex_id))
-                             for vertex in vertices])
+            entity_num_edges = sum([len(graph.get_edges(vertex.vertex_id))
+                                    for vertex in vertices])
             self.assertEqual(entity[self.NUM_EDGES_PER_TYPE],
-                             num_edges,
+                             entity_num_edges,
                              '%s%s' % ('Num edges is incorrect for: ',
                                        entity[VProps.TYPE]))
 
+        self.assertEqual(num_entities, graph.num_vertices())
+        self.assertEqual(num_edges, graph.num_edges())
+
     @staticmethod
     def _get_value(item, key):
         return utils.uni2str(item[key])