diff --git a/tests/env/src/lib.rs b/tests/env/src/lib.rs
index 44c1d5ba..ddf20761 100644
--- a/tests/env/src/lib.rs
+++ b/tests/env/src/lib.rs
@@ -200,10 +200,11 @@ impl Env {
             .or_insert_with(|| port_check::free_local_ipv4_port().unwrap());
         let snap_states = self.penv.as_mut().map(|env| env.get(id));
         let node = Node::new(id, free_port, self.n_shards, snap_states).unwrap();
-        port_check::is_port_reachable_with_timeout(
+        assert!(port_check::is_port_reachable_with_timeout(
             node.address().to_string(),
             Duration::from_secs(5),
-        );
+        ));
+
         self.nodes.insert(id, node);
     }
 
diff --git a/tests/sorock-tests/src/lib.rs b/tests/sorock-tests/src/lib.rs
index 68af61d1..54233ef1 100644
--- a/tests/sorock-tests/src/lib.rs
+++ b/tests/sorock-tests/src/lib.rs
@@ -34,7 +34,7 @@ impl Builder {
         let mut env = Env::new(p, self.with_persistency, self.with_logging);
         for id in 0..n {
             env.add_node(id);
-            env.check_connectivity(0).await?;
+            env.check_connectivity(id).await?;
         }
         Ok(Cluster { env })
     }