diff --git a/tests/universal/network/pub_sub.cxx b/tests/universal/network/pub_sub.cxx
index 51626cc6..4bc2d86d 100644
--- a/tests/universal/network/pub_sub.cxx
+++ b/tests/universal/network/pub_sub.cxx
@@ -47,12 +47,8 @@ template <typename Talloc>
 void pub_sub(Talloc& alloc) {
     KeyExpr ke("zenoh/test");
     auto session1 = Session::open(Config::create_default());
-#ifdef ZENOHCXX_ZENOHC
     auto session2 = Session::open(Config::create_default());
-#else
-    // TODO: test fails on zenoh-pico with 2 session instances. To be fixed
-    auto& session2 = session1;
-#endif
+
     auto publisher = session1.declare_publisher(ke);
 
     std::this_thread::sleep_for(1s);
@@ -88,12 +84,7 @@ template <typename Talloc>
 void put_sub(Talloc& alloc) {
     KeyExpr ke("zenoh/test");
     auto session1 = Session::open(Config::create_default());
-#ifdef ZENOHCXX_ZENOHC
     auto session2 = Session::open(Config::create_default());
-#else
-    // TODO: test fails on zenoh-pico with 2 session instances. To be fixed
-    auto& session2 = session1;
-#endif
 
     std::this_thread::sleep_for(1s);
 
diff --git a/zenoh-c b/zenoh-c
index 28518e8e..91400a1d 160000
--- a/zenoh-c
+++ b/zenoh-c
@@ -1 +1 @@
-Subproject commit 28518e8eccaec31004de2a6a784154d6a6311519
+Subproject commit 91400a1dbcb5b585cea23a79756c71a9f5d3e907
diff --git a/zenoh-pico b/zenoh-pico
index fd998225..6861694d 160000
--- a/zenoh-pico
+++ b/zenoh-pico
@@ -1 +1 @@
-Subproject commit fd998225d53713d75a90907d6e287c958f470147
+Subproject commit 6861694d488c6697a33dc1be136c80edcdb24a5e