diff --git a/nim-waku b/nim-waku
index 967db6d610..7c5df3379b 160000
--- a/nim-waku
+++ b/nim-waku
@@ -1 +1 @@
-Subproject commit 967db6d6102646549bc2184b6fd26968ca764de7
+Subproject commit 7c5df3379b42f1e5ddad66e84e152aec6ebdf10d
diff --git a/package.json b/package.json
index e240beab40..eb8b176b6c 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "pretest:1-init-git-submodules": "[ -f './nim-waku/build/wakunode2' ] || git submodule update --init --recursive",
     "pretest:2-build-nim-waku": "[ -f './nim-waku/build/wakunode2' ] || run-s nim-waku:build",
     "nim-waku:build": "(cd nim-waku; NIMFLAGS=\"-d:chronicles_colors=off -d:chronicles_sinks=textlines -d:chronicles_log_level=TRACE\" make -j$(nproc --all 2>/dev/null || echo 2) wakunode2)",
+    "nim-waku:upgrade":"(cd nim-waku && git pull origin master && rm -rf ./build/ ./vendor && make -j$(nproc --all 2>/dev/null || echo 2) update) && run-s nim-waku:build",
     "test": "run-s build test:*",
     "test:lint": "eslint src --ext .ts",
     "test:prettier": "prettier \"src/**/*.ts\" \"./*.json\" --list-different",
diff --git a/src/lib/waku_store/index.spec.ts b/src/lib/waku_store/index.spec.ts
index 1cec38b0b9..a4a20a2528 100644
--- a/src/lib/waku_store/index.spec.ts
+++ b/src/lib/waku_store/index.spec.ts
@@ -18,10 +18,12 @@ describe('Waku Store', () => {
     this.timeout(5_000);
 
     nimWaku = new NimWaku(makeLogFileName(this));
-    await nimWaku.start({ store: true });
+    await nimWaku.start({ persistMessages: true });
 
     for (let i = 0; i < 2; i++) {
-      await nimWaku.sendMessage(WakuMessage.fromUtf8String(`Message ${i}`));
+      expect(
+        await nimWaku.sendMessage(WakuMessage.fromUtf8String(`Message ${i}`))
+      ).to.be.true;
     }
 
     waku = await Waku.create({
@@ -50,10 +52,12 @@ describe('Waku Store', () => {
     this.timeout(5_000);
 
     nimWaku = new NimWaku(makeLogFileName(this));
-    await nimWaku.start({ store: true });
+    await nimWaku.start({ persistMessages: true });
 
     for (let i = 0; i < 15; i++) {
-      await nimWaku.sendMessage(WakuMessage.fromUtf8String(`Message ${i}`));
+      expect(
+        await nimWaku.sendMessage(WakuMessage.fromUtf8String(`Message ${i}`))
+      ).to.be.true;
     }
 
     waku = await Waku.create({
diff --git a/src/test_utils/nim_waku.ts b/src/test_utils/nim_waku.ts
index 6136517112..34ac85ab61 100644
--- a/src/test_utils/nim_waku.ts
+++ b/src/test_utils/nim_waku.ts
@@ -32,7 +32,7 @@ export interface Args {
   nodekey?: string;
   portsShift?: number;
   logLevel?: LogLevel;
-  store?: boolean;
+  persistMessages?: boolean;
 }
 
 export enum LogLevel {