diff --git a/extensions/matrix/src/matrix/credentials.test.ts b/extensions/matrix/src/matrix/credentials.test.ts
index 8fbc0ae3e4c..6693909b808 100644
--- a/extensions/matrix/src/matrix/credentials.test.ts
+++ b/extensions/matrix/src/matrix/credentials.test.ts
@@ -182,13 +182,17 @@ describe("matrix credentials storage", () => {
     );
 
     let releaseFirstWrite: (() => void) | undefined;
-    let firstWriteStarted = false;
+    let resolveFirstWriteStarted: (() => void) | undefined;
+    const firstWriteStarted = new Promise<void>((resolve) => {
+      resolveFirstWriteStarted = resolve;
+    });
     const originalRename = fsPromises.rename.bind(fsPromises);
     const renameSpy = vi
       .spyOn(fsPromises, "rename")
       .mockImplementation(async (...args: Parameters<typeof fsPromises.rename>) => {
-        if (!firstWriteStarted) {
-          firstWriteStarted = true;
+        if (resolveFirstWriteStarted) {
+          resolveFirstWriteStarted();
+          resolveFirstWriteStarted = undefined;
           await new Promise<void>((resolve) => {
             releaseFirstWrite = resolve;
           });
@@ -208,9 +212,7 @@ describe("matrix credentials storage", () => {
         "default",
       );
 
-      await vi.waitFor(() => {
-        expect(firstWriteStarted).toBe(true);
-      });
+      await firstWriteStarted;
 
       const newerSavePromise = saveMatrixCredentials(
         {
diff --git a/extensions/matrix/src/matrix/thread-bindings.test.ts b/extensions/matrix/src/matrix/thread-bindings.test.ts
index 535d2a9c18a..7e5b74be729 100644
--- a/extensions/matrix/src/matrix/thread-bindings.test.ts
+++ b/extensions/matrix/src/matrix/thread-bindings.test.ts
@@ -142,18 +142,16 @@ describe("matrix thread bindings", () => {
       parentConversationId?: string;
     },
   ) {
-    await vi.waitFor(async () => {
-      const persistedRaw = await fs.readFile(bindingsPath, "utf-8");
-      expect(JSON.parse(persistedRaw)).toMatchObject({
-        version: 1,
-        bindings: [
-          expect.objectContaining({
-            conversationId: expected.conversationId,
-            parentConversationId: expected.parentConversationId ?? "!room:example",
-            targetSessionKey: expected.targetSessionKey,
-          }),
-        ],
-      });
+    const persistedRaw = await fs.readFile(bindingsPath, "utf-8");
+    expect(JSON.parse(persistedRaw)).toMatchObject({
+      version: 1,
+      bindings: [
+        expect.objectContaining({
+          conversationId: expected.conversationId,
+          parentConversationId: expected.parentConversationId ?? "!room:example",
+          targetSessionKey: expected.targetSessionKey,
+        }),
+      ],
     });
   }