diff --git a/packages/tests/src/lib/service_node.ts b/packages/tests/src/lib/service_node.ts
index 3c74bdb65..7b472137c 100644
--- a/packages/tests/src/lib/service_node.ts
+++ b/packages/tests/src/lib/service_node.ts
@@ -113,7 +113,8 @@ export class ServiceNode {
 
           // waku nodes takes some time to bind port so to decrease chances of conflict
           // we also randomize the first port that portfinder will try
-          const startPort = Math.floor(Math.random() * (65535 - 1025) + 1025);
+          // depending on getPorts count adjust the random function in such a way that max port is 65535
+          const startPort = Math.floor(Math.random() * (65530 - 1025) + 1025);
 
           const ports: Ports = await new Promise((resolve, reject) => {
             portfinder.getPorts(4, { port: startPort }, (err, ports) => {
diff --git a/packages/tests/tests/connection-mananger/methods.spec.ts b/packages/tests/tests/connection-mananger/methods.spec.ts
index a43c1f2b8..1a2175e1c 100644
--- a/packages/tests/tests/connection-mananger/methods.spec.ts
+++ b/packages/tests/tests/connection-mananger/methods.spec.ts
@@ -232,8 +232,7 @@ describe("Public methods", function () {
     ).to.eq(0);
   });
 
-  // Will be skipped until https://github.com/waku-org/js-waku/issues/1835 is fixed
-  it.skip("dispatchEvent via connectionManager", async function () {
+  it("dispatchEvent via connectionManager", async function () {
     const peerIdBootstrap = await createSecp256k1PeerId();
     await waku.libp2p.peerStore.save(peerIdBootstrap, {
       tags: {
@@ -252,7 +251,9 @@ describe("Public methods", function () {
       );
     });
     waku.connectionManager.dispatchEvent(
-      new CustomEvent<PeerId>("peer:connect", { detail: peerIdBootstrap })
+      new CustomEvent<PeerId>(EPeersByDiscoveryEvents.PEER_CONNECT_BOOTSTRAP, {
+        detail: peerIdBootstrap
+      })
     );
     expect(await peerConnectedBootstrap).to.eq(true);
   });
diff --git a/packages/tests/tests/peer-exchange/query.spec.ts b/packages/tests/tests/peer-exchange/query.spec.ts
index 1d33d3fe9..dca0ffb96 100644
--- a/packages/tests/tests/peer-exchange/query.spec.ts
+++ b/packages/tests/tests/peer-exchange/query.spec.ts
@@ -123,7 +123,8 @@ describe("Peer Exchange Query", function () {
     await tearDownNodes([nwaku1, nwaku2, nwaku3], waku);
   });
 
-  it("connected peers and dial", async function () {
+  // slow and flaky in CI
+  it.skip("connected peers and dial", async function () {
     expect(peerInfos[0].ENR).to.not.be.null;
     expect(peerInfos[0].ENR?.peerInfo?.multiaddrs).to.not.be.null;