diff --git a/src/gateway/client-start-readiness.test.ts b/src/gateway/client-start-readiness.test.ts
index c90527b8b00..444b1c6f250 100644
--- a/src/gateway/client-start-readiness.test.ts
+++ b/src/gateway/client-start-readiness.test.ts
@@ -16,7 +16,9 @@ describe("startGatewayClientWhenEventLoopReady", () => {
     await vi.advanceTimersByTimeAsync(1);
     expect(client.start).not.toHaveBeenCalled();
     await vi.advanceTimersByTimeAsync(1);
-    await expect(promise).resolves.toMatchObject({ ready: true });
+    const readiness = await promise;
+    expect(readiness.ready).toBe(true);
+    expect(readiness.aborted).toBe(false);
 
     expect(client.start).toHaveBeenCalledTimes(1);
   });
@@ -32,7 +34,9 @@ describe("startGatewayClientWhenEventLoopReady", () => {
     });
     controller.abort();
 
-    await expect(promise).resolves.toMatchObject({ ready: false, aborted: true });
+    const readiness = await promise;
+    expect(readiness.ready).toBe(false);
+    expect(readiness.aborted).toBe(true);
     expect(client.start).not.toHaveBeenCalled();
   });
 });
diff --git a/src/gateway/server.device-pair-approve-supersede.test.ts b/src/gateway/server.device-pair-approve-supersede.test.ts
index b7937b3cdc2..fef29daa6ff 100644
--- a/src/gateway/server.device-pair-approve-supersede.test.ts
+++ b/src/gateway/server.device-pair-approve-supersede.test.ts
@@ -36,7 +36,8 @@ describe("gateway device.pair.approve superseded request ids", () => {
     expect(latestApprove?.status).toBe("approved");
 
     const paired = await getPairedDevice("supersede-device-1");
-    expect(paired?.roles).toEqual(expect.arrayContaining(["node", "operator"]));
-    expect(paired?.scopes).toEqual(expect.arrayContaining(["operator.admin"]));
+    expect(paired?.roles).toContain("node");
+    expect(paired?.roles).toContain("operator");
+    expect(paired?.scopes).toContain("operator.admin");
   });
 });