diff --git a/src/state/CallViewModel.test.ts b/src/state/CallViewModel.test.ts
index a869b609..91ce2db9 100644
--- a/src/state/CallViewModel.test.ts
+++ b/src/state/CallViewModel.test.ts
@@ -47,7 +47,7 @@ import {
   type ECConnectionState,
 } from "../livekit/useECConnectionState";
 import { E2eeType } from "../e2ee/e2eeType";
-import { RaisedHandInfo } from "../reactions";
+import type { RaisedHandInfo } from "../reactions";
 
 vi.mock("@livekit/components-core");
 
diff --git a/src/tile/GridTile.test.tsx b/src/tile/GridTile.test.tsx
index c02ce307..1c71c17b 100644
--- a/src/tile/GridTile.test.tsx
+++ b/src/tile/GridTile.test.tsx
@@ -16,7 +16,7 @@ import { GridTile } from "./GridTile";
 import { mockRtcMembership, withRemoteMedia } from "../utils/test";
 import { GridTileViewModel } from "../state/TileViewModel";
 import { ReactionsSenderProvider } from "../reactions/useReactionsSender";
-import { CallViewModel } from "../state/CallViewModel";
+import type { CallViewModel } from "../state/CallViewModel";
 
 global.IntersectionObserver = class MockIntersectionObserver {
   public observe(): void {}
diff --git a/src/utils/test-viewmodel.ts b/src/utils/test-viewmodel.ts
index c1a9f13f..761ce6c5 100644
--- a/src/utils/test-viewmodel.ts
+++ b/src/utils/test-viewmodel.ts
@@ -8,7 +8,10 @@ Please see LICENSE in the repository root for full details.
 import { ConnectionState } from "livekit-client";
 import { type MatrixClient } from "matrix-js-sdk/src/client";
 import { type RoomMember } from "matrix-js-sdk/src/matrix";
-import { type CallMembership, type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
+import {
+  type CallMembership,
+  type MatrixRTCSession,
+} from "matrix-js-sdk/src/matrixrtc";
 import { BehaviorSubject, of } from "rxjs";
 import { vitest } from "vitest";
 import { type RelationsContainer } from "matrix-js-sdk/src/models/relations-container";
diff --git a/src/utils/test.ts b/src/utils/test.ts
index 56053964..431289b1 100644
--- a/src/utils/test.ts
+++ b/src/utils/test.ts
@@ -205,8 +205,8 @@ export async function withLocalMedia(
       kind: E2eeType.PER_PARTICIPANT,
     },
     mockLivekitRoom({ localParticipant }),
-    of(undefined),
-    of(undefined),
+    of(null),
+    of(null),
   );
   try {
     await continuation(vm);
@@ -243,8 +243,8 @@ export async function withRemoteMedia(
       kind: E2eeType.PER_PARTICIPANT,
     },
     mockLivekitRoom({}, { remoteParticipants: of([remoteParticipant]) }),
-    of(undefined),
-    of(undefined),
+    of(null),
+    of(null),
   );
   try {
     await continuation(vm);