diff --git a/src/components/ContextMenu.test.tsx b/src/components/ContextMenu.test.tsx
index 40d0b6d6..524d0680 100644
--- a/src/components/ContextMenu.test.tsx
+++ b/src/components/ContextMenu.test.tsx
@@ -30,11 +30,11 @@ vi.mock('@/api/subsonic', () => ({
 }));
 
 
-vi.mock('@/features/orbit', () => ({
+vi.mock('@/features/orbit/utils/orbitBulkGuard', () => ({
   orbitBulkGuard: vi.fn(async () => true),
 }));
 
-vi.mock('@/features/offline', () => ({
+vi.mock('@/features/offline/hooks/useOfflineBrowseContext', () => ({
   useOfflineBrowseContext: () => ({
     active: false,
     serverId: 'srv-1',
diff --git a/src/components/QueuePanel.test.tsx b/src/components/QueuePanel.test.tsx
index 5e1e3ce3..45e88ec3 100644
--- a/src/components/QueuePanel.test.tsx
+++ b/src/components/QueuePanel.test.tsx
@@ -26,7 +26,7 @@ vi.mock('@/api/subsonic', () => ({
 }));
 
 
-vi.mock('@/features/orbit', () => ({
+vi.mock('@/features/orbit/utils/orbitBulkGuard', () => ({
   orbitBulkGuard: vi.fn(async () => true),
 }));
 
diff --git a/src/features/offline/utils/pinnedOfflineSync.test.ts b/src/features/offline/utils/pinnedOfflineSync.test.ts
index e09bf89b..426d6f0c 100644
--- a/src/features/offline/utils/pinnedOfflineSync.test.ts
+++ b/src/features/offline/utils/pinnedOfflineSync.test.ts
@@ -29,7 +29,7 @@ vi.mock('@/utils/network/activeServerReachability', () => ({
   onActiveServerBecameReachable: () => () => {},
 }));
 
-vi.mock('@/features/playlist', () => ({
+vi.mock('@/features/playlist/api/subsonicPlaylists', () => ({
   getPlaylistForServer: (serverId: string, id: string) => getPlaylistMock(serverId, id),
 }));
 
diff --git a/src/store/playerStore.events.test.ts b/src/store/playerStore.events.test.ts
index c0250762..4fe0be5c 100644
--- a/src/store/playerStore.events.test.ts
+++ b/src/store/playerStore.events.test.ts
@@ -44,7 +44,7 @@ vi.mock('@/music-network', () => {
   };
 });
 
-vi.mock('@/features/orbit', () => ({
+vi.mock('@/features/orbit/utils/orbitBulkGuard', () => ({
   orbitBulkGuard: vi.fn(async () => true),
 }));
 
diff --git a/src/store/playerStore.misc.test.ts b/src/store/playerStore.misc.test.ts
index 6ada644c..2bce5a96 100644
--- a/src/store/playerStore.misc.test.ts
+++ b/src/store/playerStore.misc.test.ts
@@ -42,7 +42,7 @@ vi.mock('@/music-network', () => ({
   getMusicNetworkRuntimeOrNull: () => runtimeMock,
 }));
 
-vi.mock('@/features/orbit', () => ({
+vi.mock('@/features/orbit/utils/orbitBulkGuard', () => ({
   orbitBulkGuard: vi.fn(async () => true),
 }));
 
diff --git a/src/store/playerStore.playbackActions.test.ts b/src/store/playerStore.playbackActions.test.ts
index 315be45a..3a64bccd 100644
--- a/src/store/playerStore.playbackActions.test.ts
+++ b/src/store/playerStore.playbackActions.test.ts
@@ -47,7 +47,7 @@ vi.mock('@/music-network', () => {
   };
 });
 
-vi.mock('@/features/orbit', () => ({
+vi.mock('@/features/orbit/utils/orbitBulkGuard', () => ({
   orbitBulkGuard: vi.fn(async () => true),
 }));
 
diff --git a/src/store/playerStore.queue.test.ts b/src/store/playerStore.queue.test.ts
index 7c12c579..0f91e910 100644
--- a/src/store/playerStore.queue.test.ts
+++ b/src/store/playerStore.queue.test.ts
@@ -26,7 +26,7 @@ vi.mock('@/api/subsonic', async () => {
 
 // `enqueue` / `enqueueAt` call `orbitBulkGuard` for multi-track inserts when
 // the caller hasn't pre-confirmed. Force the guard to short-circuit through.
-vi.mock('@/features/orbit', () => ({
+vi.mock('@/features/orbit/utils/orbitBulkGuard', () => ({
   orbitBulkGuard: vi.fn(async () => true),
 }));