diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3dd6d7f41a..b81bc2519b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
       BUF_VERSION: '0.41.0'
     strategy:
       matrix:
-        node: [14, 16]
+        node: [14]
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/bors.toml b/bors.toml
index 813eae142f..5c0729b8c1 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,8 +1,6 @@
 status = [
   "build_and_test (14, ubuntu-latest)",
-  "build_and_test (16, ubuntu-latest)",
   "build_and_test (14, macos-latest)",
-  "build_and_test (16, macos-latest)",
   "web_chat_build_and_test"
 ]
 block_labels = ["work-in-progress"]
diff --git a/src/lib/waku_relay/index.spec.ts b/src/lib/waku_relay/index.spec.ts
index 0468c3665c..c091d08e19 100644
--- a/src/lib/waku_relay/index.spec.ts
+++ b/src/lib/waku_relay/index.spec.ts
@@ -93,7 +93,7 @@ describe('Waku Relay', () => {
       let nimWaku: NimWaku;
 
       beforeEach(async function () {
-        this.timeout(12_000);
+        this.timeout(30_000);
         waku = await Waku.create({
           staticNoiseKey: NOISE_KEY_1,
           listenAddresses: ['/ip4/0.0.0.0/tcp/0'],
@@ -167,7 +167,7 @@ describe('Waku Relay', () => {
       let nimWaku: NimWaku;
 
       beforeEach(async function () {
-        this.timeout(10_000);
+        this.timeout(30_000);
         waku = await Waku.create({
           staticNoiseKey: NOISE_KEY_1,
           modules: { transport: [TCP] },
@@ -195,9 +195,12 @@ describe('Waku Relay', () => {
       });
 
       it('nim subscribes to js', async function () {
-        const subscribers = waku.libp2p.pubsub.getSubscribers(
-          RelayDefaultTopic
-        );
+        let subscribers: string[] = [];
+
+        while (subscribers.length === 0) {
+          await delay(200);
+          subscribers = waku.libp2p.pubsub.getSubscribers(RelayDefaultTopic);
+        }
 
         const nimPeerId = await nimWaku.getPeerId();
         expect(subscribers).to.contain(nimPeerId.toB58String());