diff --git a/tests/LSP6KeyManager/Relay/ExecuteRelayCall.test.ts b/tests/LSP6KeyManager/Relay/ExecuteRelayCall.test.ts
index 119e86bef..2ffcc61aa 100644
--- a/tests/LSP6KeyManager/Relay/ExecuteRelayCall.test.ts
+++ b/tests/LSP6KeyManager/Relay/ExecuteRelayCall.test.ts
@@ -1142,8 +1142,8 @@ export const shouldBehaveLikeExecuteRelayCall = (
             [transferLyxPayload, transferLyxPayload],
           ),
       )
-        .to.be.revertedWithCustomError(context.keyManager, 'InvalidRelayNonce')
-        .withArgs(incorrectRecoveredAddress, ownerNonce.add(1), transferLyxSignature);
+        .to.be.revertedWithCustomError(context.keyManager, 'CannotUseSignatureTwice')
+        .withArgs(transferLyxSignature);
     });
 
     it('should 1) give the permission to someone to mint, 2) let the controller mint, 3) remove the permission to the controller to mint', async () => {
diff --git a/tests/Reentrancy/LSP6/LSP6Reentrancy.test.ts b/tests/Reentrancy/LSP6/LSP6Reentrancy.test.ts
index 126cccaf7..2faa79f54 100644
--- a/tests/Reentrancy/LSP6/LSP6Reentrancy.test.ts
+++ b/tests/Reentrancy/LSP6/LSP6Reentrancy.test.ts
@@ -182,8 +182,8 @@ export const shouldBehaveLikeLSP6ReentrancyScenarios = (
               .connect(relayer)
               .executeRelayCall(signature, nonce, validityTimestamps, executeRelayCallPayload),
           )
-            .to.be.revertedWithCustomError(context.keyManager, 'InvalidRelayNonce')
-            .withArgs(signer.address, nonce, signature);
+            .to.be.revertedWithCustomError(context.keyManager, 'CannotUseSignatureTwice')
+            .withArgs(signature);
         });
       });
     });