diff --git a/src/test_data.py b/src/test_data.py
index a2385a5a..f11669fc 100644
--- a/src/test_data.py
+++ b/src/test_data.py
@@ -65,14 +65,7 @@ INVALID_CONTENT_TOPICS = [
     {"description": "A bool", "value": True},
 ]
 
-VALID_PUBSUB_TOPICS = [
-    DEFAULT_PUBSUB_TOPIC,
-    "/waku/2/rs/0/1",
-    "/waku/2/rs/0/0",
-    "/waku/2/rs/0/9",
-    "/waku/2/rs/0/25",
-    "/waku/2/rs/0/1000",
-]
+VALID_PUBSUB_TOPICS = ["/waku/2/rs/0/1", "/waku/2/rs/0/0", "/waku/2/rs/0/9", "/waku/2/rs/0/25", "/waku/2/rs/0/1000", DEFAULT_PUBSUB_TOPIC]
 
 INVALID_PUBSUB_TOPICS = ["/test/2/rs/0/1", "/waku/3/rs/0/1", "/waku/2/test/0/1", "/waku/2/rs/0/b", "/waku/2/rs/0"]
 
diff --git a/tests/filter/test_subscribe_create.py b/tests/filter/test_subscribe_create.py
index fee9d887..de267b51 100644
--- a/tests/filter/test_subscribe_create.py
+++ b/tests/filter/test_subscribe_create.py
@@ -43,7 +43,7 @@ class TestFilterSubscribeCreate(StepsFilter):
             except Exception as ex:
                 logger.error(f"PubsubTopic {pubsub_topic} failed: {str(ex)}")
                 failed_pubsub_topics.append(pubsub_topic)
-        assert failed_pubsub_topics == [self.another_cluster_pubsub_topic], f"PubsubTopics failed: {failed_pubsub_topics}"
+        assert not failed_pubsub_topics, f"PubsubTopics failed: {failed_pubsub_topics}"
 
     def test_filter_subscribe_to_30_content_topics_in_one_call(self):
         failed_content_topics = []
diff --git a/tests/filter/test_unsubscribe.py b/tests/filter/test_unsubscribe.py
index 6c8ccbee..02375bf1 100644
--- a/tests/filter/test_unsubscribe.py
+++ b/tests/filter/test_unsubscribe.py
@@ -69,7 +69,7 @@ class TestFilterUnSubscribe(StepsFilter):
             )
             raise AssertionError("Unsubscribe from more than 30 content topics worked!!!")
         except Exception as ex:
-            assert "Not Found" in str(ex) and "exceeds maximum content topics: 30" in str(ex)
+            assert "exceeds maximum content topics: 30" in str(ex)
 
     def test_filter_unsubscribe_with_no_content_topic(self):
         try: