diff --git a/server/src/__tests__/instance-settings-service.test.ts b/server/src/__tests__/instance-settings-service.test.ts
index dbca0fa120..4177666965 100644
--- a/server/src/__tests__/instance-settings-service.test.ts
+++ b/server/src/__tests__/instance-settings-service.test.ts
@@ -28,6 +28,7 @@ describe("instance settings service", () => {
       enableEnvironments: true,
       enableIsolatedWorkspaces: true,
       enableStreamlinedLeftNavigation: true,
+      enableApps: false,
       enableConferenceRoomChat: false,
       enableExternalObjects: false,
       enablePipelines: false,
@@ -36,6 +37,7 @@ describe("instance settings service", () => {
       enableExperimentalFileViewer: true,
       enableTaskWatchdogs: true,
       enableCloudSync: true,
+      enableSmokeLab: false,
       enableBuiltInAgents: true,
       enableDecisions: false,
       enableGoalsSidebarLink: true,
diff --git a/server/src/__tests__/plugin-execution-workspace-bridge.test.ts b/server/src/__tests__/plugin-execution-workspace-bridge.test.ts
index 6c672f5113..668e198223 100644
--- a/server/src/__tests__/plugin-execution-workspace-bridge.test.ts
+++ b/server/src/__tests__/plugin-execution-workspace-bridge.test.ts
@@ -26,7 +26,10 @@ describe("plugin execution workspace bridge", () => {
     });
 
     await expect(
-      handlers["executionWorkspaces.get"]({ workspaceId: "workspace-1", companyId: "company-1" }),
+      handlers["executionWorkspaces.get"](
+        { workspaceId: "workspace-1", companyId: "company-1" },
+        { invocationScope: { companyId: "company-1" } },
+      ),
     ).resolves.toMatchObject({
       id: "workspace-1",
       cwd: "/tmp/workspace-1",
@@ -45,7 +48,10 @@ describe("plugin execution workspace bridge", () => {
     });
 
     await expect(
-      handlers["executionWorkspaces.get"]({ workspaceId: "workspace-1", companyId: "company-1" }),
+      handlers["executionWorkspaces.get"](
+        { workspaceId: "workspace-1", companyId: "company-1" },
+        { invocationScope: { companyId: "company-1" } },
+      ),
     ).rejects.toMatchObject({
       code: PLUGIN_RPC_ERROR_CODES.CAPABILITY_DENIED,
     });
diff --git a/server/src/__tests__/plugin-routes-authz.test.ts b/server/src/__tests__/plugin-routes-authz.test.ts
index 2f74a1aaa4..2a83fc2536 100644
--- a/server/src/__tests__/plugin-routes-authz.test.ts
+++ b/server/src/__tests__/plugin-routes-authz.test.ts
@@ -322,13 +322,17 @@ describe.sequential("plugin install and upgrade authz", () => {
     const res = await request(app)
       .post(`/api/plugins/${pluginId}/config`)
       .send({
+        companyId: companyA,
         configJson: {
-          apiKeyRef: "77777777-7777-4777-8777-777777777777",
+          apiKeyRef: {
+            type: "secret_ref",
+            secretId: "77777777-7777-4777-8777-777777777777",
+          },
         },
       });
 
     expect(res.status).toBe(422);
-    expect(res.body.error).toMatch(/secret references are disabled/i);
+    expect(res.body.error).toMatch(/secret references require/i);
     expect(mockRegistry.upsertConfig).not.toHaveBeenCalled();
   }, 20_000);
 
diff --git a/ui/src/pages/InstanceExperimentalSettings.test.tsx b/ui/src/pages/InstanceExperimentalSettings.test.tsx
index 300f2e2454..45f4da85c1 100644
--- a/ui/src/pages/InstanceExperimentalSettings.test.tsx
+++ b/ui/src/pages/InstanceExperimentalSettings.test.tsx
@@ -55,7 +55,6 @@ const SERVER_INFO_TOGGLE_SELECTOR =
   'button[aria-label="Toggle server info debug view experimental setting"]';
 const BUILT_IN_AGENTS_TOGGLE_SELECTOR =
   'button[aria-label="Toggle built-in agents experimental setting"]';
-const APPS_TOGGLE_SELECTOR = 'button[aria-label="Toggle apps experimental setting"]';
 const AUTO_RECOVERY_TOGGLE_SELECTOR =
   'button[aria-label="Toggle task graph liveness auto-recovery"]';
 
@@ -188,19 +187,6 @@ describe("InstanceExperimentalSettings — Conference Room Chat card (PAP-11233)
     expect(warning?.textContent).toContain("no compatibility guarantees");
   });
 
-  it("enables the Apps UI from experimental settings", async () => {
-    await renderPage();
-
-    const toggle = container.querySelector<HTMLButtonElement>(APPS_TOGGLE_SELECTOR);
-    expect(toggle?.getAttribute("aria-checked")).toBe("false");
-
-    await act(() => toggle?.click());
-    await flushReact();
-
-    expect(mockInstanceSettingsApi.updateExperimental).toHaveBeenCalledWith({ enableApps: true });
-    expect(container.querySelector(APPS_TOGGLE_SELECTOR)?.getAttribute("aria-checked")).toBe("true");
-  });
-
   it("does not render the Conference Room Chat experimental setting for now", async () => {
     await renderPage();