diff --git a/server/src/__tests__/companies-service.test.ts b/server/src/__tests__/companies-service.test.ts
index 869d80062eb..8dd76866af0 100644
--- a/server/src/__tests__/companies-service.test.ts
+++ b/server/src/__tests__/companies-service.test.ts
@@ -10,9 +10,11 @@ import {
   companies,
   companySkillVersions,
   companySkills,
+  companyMemberships,
   createDb,
   heartbeatRunEvents,
   heartbeatRuns,
+  principalPermissionGrants,
   routines,
   routineTriggers,
 } from "@paperclipai/db";
@@ -54,6 +56,8 @@ describeEmbeddedPostgres("companyService", () => {
     await db.delete(agentConfigRevisions);
     await db.delete(activityLog);
     await db.delete(agents);
+    await db.delete(principalPermissionGrants);
+    await db.delete(companyMemberships);
     await db.delete(companies);
   });
 
diff --git a/server/src/__tests__/invite-join-grants.test.ts b/server/src/__tests__/invite-join-grants.test.ts
index 0e05562fa9b..7b7fa63e016 100644
--- a/server/src/__tests__/invite-join-grants.test.ts
+++ b/server/src/__tests__/invite-join-grants.test.ts
@@ -68,6 +68,7 @@ describe("human invite roles", () => {
   it("maps owner to the full management grant set", () => {
     expect(grantsForHumanRole("owner")).toEqual([
       { permissionKey: "agents:create", scope: null },
+      { permissionKey: "agents:configure", scope: null },
       { permissionKey: "skills:create", scope: null },
       { permissionKey: "environments:manage", scope: null },
       { permissionKey: "users:invite", scope: null },
@@ -80,6 +81,7 @@ describe("human invite roles", () => {
   it("maps admin to management grants including environment management", () => {
     expect(grantsForHumanRole("admin")).toEqual([
       { permissionKey: "agents:create", scope: null },
+      { permissionKey: "agents:configure", scope: null },
       { permissionKey: "skills:create", scope: null },
       { permissionKey: "environments:manage", scope: null },
       { permissionKey: "users:invite", scope: null },