diff --git a/vitrage_tempest_plugin/tests/base.py b/vitrage_tempest_plugin/tests/base.py
index eae0333..40808b0 100644
--- a/vitrage_tempest_plugin/tests/base.py
+++ b/vitrage_tempest_plugin/tests/base.py
@@ -81,10 +81,13 @@ class BaseVitrageTempest(test.BaseTestCase):
         self.assertSetEqual(s1, s2, message)
 
     def assert_sequence_equal(self, s1, s2, message=None):
-        self.assertSequenceEqual(self, s1, s2, message)
+        self.assertSequenceEqual(s1, s2, message)
 
-    def assert_tuple_equal(self, s1, s2, message=None):
-        self.assertTupleEqual(self, s1, s2, message)
+    def assert_tuple_equal(self, t1, t2, message=None):
+        self.assertTupleEqual(t1, t2, message)
+
+    def assert_items_equal(self, s1, s2, message=None):
+        self.assertItemsEqual(s1, s2, message)
 
     def assert_timestamp_equal(self, first, second, msg=None):
         """Checks that two timestamps are equals.
diff --git a/vitrage_tempest_plugin/tests/common/vitrage_utils.py b/vitrage_tempest_plugin/tests/common/vitrage_utils.py
index 8f61fc8..99bef04 100644
--- a/vitrage_tempest_plugin/tests/common/vitrage_utils.py
+++ b/vitrage_tempest_plugin/tests/common/vitrage_utils.py
@@ -16,10 +16,6 @@ import os
 
 from oslo_log import log as logging
 
-from vitrage.graph.driver.networkx_graph import NXGraph
-from vitrage.graph import Edge
-from vitrage.graph import Vertex
-
 from vitrage_tempest_plugin.tests.common.constants import NOVA_HOST_DATASOURCE
 from vitrage_tempest_plugin.tests.common.constants import \
     NOVA_INSTANCE_DATASOURCE
@@ -96,20 +92,6 @@ def delete_template(uuid=None, **kwargs):
         _id=uuid)
 
 
-def topology_to_graph(topology):
-    graph = NXGraph()
-    nodes = topology['nodes']
-    for n in nodes:
-        graph.add_vertex(Vertex(n['vitrage_id'], n))
-
-    edges = topology['links']
-    for i in range(len(edges)):
-        s_id = nodes[edges[i]['source']]['vitrage_id']
-        t_id = nodes[edges[i]['target']]['vitrage_id']
-        graph.add_edge(Edge(s_id, t_id, edges[i]['relationship_type']))
-    return graph
-
-
 def restart_graph():
     os.system("sudo service devstack@vitrage-graph restart")
 
diff --git a/vitrage_tempest_plugin/tests/resources/mock_datasource/test_3rd_degree_scenarios.py b/vitrage_tempest_plugin/tests/resources/mock_datasource/test_3rd_degree_scenarios.py
index 74ff2de..936fcb3 100644
--- a/vitrage_tempest_plugin/tests/resources/mock_datasource/test_3rd_degree_scenarios.py
+++ b/vitrage_tempest_plugin/tests/resources/mock_datasource/test_3rd_degree_scenarios.py
@@ -188,35 +188,34 @@ class TestLongProcessing(TestActionsBase):
         This relies on assert_dict_equal when comparing the nodes and the
         edges of each graph.
         """
-        g1 = v_utils.topology_to_graph(g1)
-        g2 = v_utils.topology_to_graph(g2)
-        g1_nodes = g1._g.node
-        g1_edges = g1._g.adj
-        g2_nodes = g2._g.node
-        g2_edges = g2._g.adj
-        self.assertEqual(g1.num_vertices(), g2.num_vertices(),
-                         msg + " Two graphs have different amount of nodes")
-        self.assertEqual(g1.num_edges(), g2.num_edges(),
-                         msg + "Two graphs have different amount of edges")
-        for n_id in g1_nodes:
-            g1_node = g1_nodes.get(n_id)
-            del g1_node['vitrage_sample_timestamp']
-            del g1_node['update_timestamp']
-            if 'graph_index' in g1_node:
-                del g1_node['graph_index']
-            g2_node = g2_nodes.get(n_id)
-            del g2_node['vitrage_sample_timestamp']
-            del g2_node['update_timestamp']
-            if 'graph_index' in g2_node:
-                del g2_node['graph_index']
-            self.assert_dict_equal(g1_nodes.get(n_id),
-                                   g2_nodes.get(n_id),
-                                   msg + "Nodes of each graph are not equal")
+        g1_nodes = g1['nodes']
+        g1_links = g1['links']
 
-        for e_source_id in g1_edges:
-            self.assert_dict_equal(dict(g1_edges.get(e_source_id)),
-                                   dict(g2_edges.get(e_source_id)),
-                                   "Edges of each graph are not equal")
+        g2_nodes = g2['nodes']
+        g2_links = g1['links']
+
+        to_remove = {'vitrage_sample_timestamp',
+                     'update_timestamp',
+                     'graph_index'}
+
+        self._remove_keys_from_dicts(g1_nodes, g2_nodes, to_remove)
+
+        self.assertItemsEqual(g1_nodes, g2_nodes,
+                              msg + "Nodes of each graph are not equal")
+        self.assert_items_equal(g1_links, g2_links,
+                                "Edges of each graph are not equal")
+
+    def _remove_keys_from_dicts(self, dictionaries1,
+                                dictionaries2, keys_to_remove):
+        self._delete_keys_from_dict(dictionaries1, keys_to_remove)
+        self._delete_keys_from_dict(dictionaries2, keys_to_remove)
+
+    @staticmethod
+    def _delete_keys_from_dict(dictionaries, keys_to_remove):
+        for dictionary in dictionaries:
+            for key in keys_to_remove:
+                if key in dictionary:
+                    del dictionary[key]
 
     def _async_doctor_events(self, spacing=1):