diff --git a/packages/evm/test/fixtures/Enclave.fixture.ts b/packages/evm/test/fixtures/Enclave.fixture.ts
index b2815e0a..36c61c04 100644
--- a/packages/evm/test/fixtures/Enclave.fixture.ts
+++ b/packages/evm/test/fixtures/Enclave.fixture.ts
@@ -6,19 +6,12 @@ import { Enclave__factory } from "../../types/factories/contracts/Enclave__facto
 export async function deployEnclaveFixture({
   owner,
   registry,
-  maxDuration,
+  maxDuration = 60 * 60 * 24 * 30,
 }: {
-  owner?: SignerWithAddress;
-  registry?: SignerWithAddress;
+  owner: SignerWithAddress;
+  registry: string;
   maxDuration?: number;
-} = {}) {
-  // Contracts are deployed using the first signer/account by default
-  const [account1, account2] = await ethers.getSigners();
-
-  owner = owner || account1;
-  registry = registry || account2;
-  maxDuration = maxDuration || 60 * 60 * 24 * 30;
-
+}) {
   const deployment = await (await ethers.getContractFactory("Enclave")).deploy(owner, registry, maxDuration);
 
   return Enclave__factory.connect(await deployment.getAddress(), owner);