diff --git a/src/env_vars.py b/src/env_vars.py
index 51b0c4d4..75090df5 100644
--- a/src/env_vars.py
+++ b/src/env_vars.py
@@ -17,7 +17,7 @@ def get_env_var(var_name, default=None):
 DEFAULT_NWAKU = "wakuorg/nwaku:latest"
 DEFAULT_GOWAKU = "wakuorg/go-waku:latest"
 NODE_1 = get_env_var("NODE_1", DEFAULT_NWAKU)
-NODE_2 = get_env_var("NODE_2", DEFAULT_NWAKU)
+NODE_2 = get_env_var("NODE_2", DEFAULT_GOWAKU)
 ADDITIONAL_NODES = get_env_var("ADDITIONAL_NODES", f"{DEFAULT_NWAKU},{DEFAULT_GOWAKU},{DEFAULT_NWAKU}")
 # more nodes need to follow the NODE_X pattern
 DOCKER_LOG_DIR = get_env_var("DOCKER_LOG_DIR", "./log/docker")
diff --git a/tests/store/test_api_flags.py b/tests/store/test_api_flags.py
index 35ce168d..0e298b37 100644
--- a/tests/store/test_api_flags.py
+++ b/tests/store/test_api_flags.py
@@ -1,5 +1,5 @@
 import pytest
-from time import time
+from src.env_vars import NODE_1, NODE_2
 from src.libs.custom_logger import get_custom_logger
 from src.libs.common import to_base64
 from src.node.waku_message import WakuMessage
@@ -17,6 +17,7 @@ class TestApiFlags(StepsStore):
         self.publish_message()
         self.check_published_message_is_stored(store_node=self.store_node1, peer_addr=self.multiaddr_list[0])
 
+    @pytest.mark.skipif("go-waku" in (NODE_1 + NODE_2), reason="Test works only with nwaku")
     def test_store_with_wrongPeerAddr(self):
         self.publish_message()
         wrong_peer_addr = self.multiaddr_list[0][1:]
diff --git a/tests/store/test_page_size.py b/tests/store/test_page_size.py
index 0d7fe7bb..7df706ef 100644
--- a/tests/store/test_page_size.py
+++ b/tests/store/test_page_size.py
@@ -1,4 +1,5 @@
 import pytest
+from src.env_vars import NODE_1, NODE_2
 from src.libs.common import to_base64
 from src.steps.store import StepsStore
 from src.libs.custom_logger import get_custom_logger
@@ -44,6 +45,7 @@ class TestPageSize(StepsStore):
             store_response = self.get_messages_from_store(node, page_size=1000000)
             assert len(store_response.messages) == 100, "Message count mismatch"
 
+    @pytest.mark.skipif("go-waku" in (NODE_1 + NODE_2), reason="Test works only with nwaku")
     def test_negative_number_page_size(self):
         page_size = -1
         for i in range(10):