diff --git a/tests/filter/test_get_messages.py b/tests/filter/test_get_messages.py
index 73f0fe62e9..1aa8e51afb 100644
--- a/tests/filter/test_get_messages.py
+++ b/tests/filter/test_get_messages.py
@@ -65,7 +65,6 @@ class TestFilterGetMessages(StepsFilter):
         except Exception as ex:
             assert "Bad Request" in str(ex)
 
-    @pytest.mark.xfail("nwaku" in NODE_1, reason="Bug reported: https://github.com/waku-org/nwaku/issues/2320")
     def test_filter_get_message_duplicate_message(self):
         message = self.create_message()
         self.check_published_message_reaches_filter_peer(message)
diff --git a/tests/filter/test_multiple_nodes.py b/tests/filter/test_multiple_nodes.py
index e11682106d..e564e015ef 100644
--- a/tests/filter/test_multiple_nodes.py
+++ b/tests/filter/test_multiple_nodes.py
@@ -22,7 +22,6 @@ class TestFilterMultipleNodes(StepsFilter):
         self.check_published_message_reaches_filter_peer(peer_list=self.main_nodes)
         self.check_publish_without_filter_subscription(peer_list=self.optional_nodes)
 
-    @pytest.mark.xfail("nwaku" in NODE_1, reason="Bug reported: https://github.com/waku-org/nwaku/issues/2319")
     def test_filter_get_message_while_one_peer_is_paused(self):
         self.setup_optional_filter_nodes()
         self.wait_for_subscriptions_on_main_nodes([self.test_content_topic])
@@ -38,7 +37,6 @@ class TestFilterMultipleNodes(StepsFilter):
         filter_messages = self.get_filter_messages(content_topic=self.test_content_topic, pubsub_topic=self.test_pubsub_topic, node=self.node2)
         assert len(filter_messages) == 2, "Both messages should've been returned"
 
-    @pytest.mark.xfail("nwaku" in NODE_1, reason="Bug reported: https://github.com/waku-org/nwaku/issues/2319")
     def test_filter_get_message_after_one_peer_was_stopped(self):
         self.setup_optional_filter_nodes()
         self.wait_for_subscriptions_on_main_nodes([self.test_content_topic])
diff --git a/tests/filter/test_subscribe_create.py b/tests/filter/test_subscribe_create.py
index 3ac8eac30a..bc2e1e5bcf 100644
--- a/tests/filter/test_subscribe_create.py
+++ b/tests/filter/test_subscribe_create.py
@@ -32,7 +32,7 @@ class TestFilterSubscribeCreate(StepsFilter):
         self.wait_for_subscriptions_on_main_nodes([self.test_content_topic], pubsub_topic=self.another_cluster_pubsub_topic)
         self.check_published_message_reaches_filter_peer(pubsub_topic=self.another_cluster_pubsub_topic)
 
-    @pytest.mark.xfail("go-waku" in NODE_2, reason="Bug reported: https://github.com/waku-org/nwaku/issues/2319")
+    @pytest.mark.xfail("go-waku" in NODE_2, reason="Bug reported: https://github.com/waku-org/go-waku/issues/1054")
     def test_filter_subscribe_to_pubsub_topics_from_multiple_clusters(self):
         pubsub_topic_list = [self.test_pubsub_topic, self.another_cluster_pubsub_topic, self.second_pubsub_topic]
         failed_pubsub_topics = []