diff --git a/src/context/tests/test_unitary.py b/src/context/tests/test_unitary.py
index 750fa2a311bd35d0f47e04da3e424ca9d10345f7..bf8857f707091a542cc229e058001b18ed843d16 100644
--- a/src/context/tests/test_unitary.py
+++ b/src/context/tests/test_unitary.py
@@ -318,16 +318,22 @@ def test_grpc_topology(
     assert response.context_uuid.uuid == DEFAULT_CONTEXT_UUID
 
     # ----- Check create event -----------------------------------------------------------------------------------------
-    event = events_collector.get_event(block=True)
-    assert isinstance(event, TopologyEvent)
-    assert event.event.event_type == EventTypeEnum.EVENTTYPE_CREATE
-    assert event.topology_id.context_id.context_uuid.uuid == DEFAULT_CONTEXT_UUID
-    assert event.topology_id.topology_uuid.uuid == DEFAULT_TOPOLOGY_UUID
-
-    event = events_collector.get_event(block=True)
-    assert isinstance(event, ContextEvent)
-    assert event.event.event_type == EventTypeEnum.EVENTTYPE_UPDATE
-    assert event.context_id.context_uuid.uuid == DEFAULT_CONTEXT_UUID
+    context_event = None
+    topology_event = None
+    for _ in range(2):
+        event = events_collector.get_event(block=True)
+        assert isinstance(event, ContextEvent, TopologyEvent)
+        if isinstance(event, ContextEvent): context_event = event
+        if isinstance(event, TopologyEvent): topology_event = event
+
+    assert context_event is not None
+    assert context_event.event.event_type == EventTypeEnum.EVENTTYPE_UPDATE
+    assert context_event.context_id.context_uuid.uuid == DEFAULT_CONTEXT_UUID
+
+    assert topology_event is not None
+    assert topology_event.event.event_type == EventTypeEnum.EVENTTYPE_CREATE
+    assert topology_event.topology_id.context_id.context_uuid.uuid == DEFAULT_CONTEXT_UUID
+    assert topology_event.topology_id.topology_uuid.uuid == DEFAULT_TOPOLOGY_UUID
 
     # ----- Update the object ------------------------------------------------------------------------------------------
     response = context_client_grpc.SetTopology(Topology(**TOPOLOGY))