diff --git a/tests/BaseCCForwarder.t.sol b/tests/BaseCCForwarder.t.sol
index d44f0ed6..1951faaf 100644
--- a/tests/BaseCCForwarder.t.sol
+++ b/tests/BaseCCForwarder.t.sol
@@ -239,11 +239,6 @@ contract BaseCCForwarderTest is BaseTest, CrossChainForwarder {
       abi.encodeWithSelector(IBaseAdapter.setupPayments.selector),
       abi.encode()
     );
-    vm.mockCall(
-      address(currentChainBridgeAdapter),
-      abi.encodeWithSelector(IBaseAdapter.forwardMessage.selector),
-      abi.encode()
-    );
     _enableBridgeAdapters(bridgeAdaptersInfo);
   }
 
diff --git a/tests/Forwarder.t.sol b/tests/Forwarder.t.sol
index 4a54bf80..363d6574 100644
--- a/tests/Forwarder.t.sol
+++ b/tests/Forwarder.t.sol
@@ -406,6 +406,7 @@ contract ForwarderTest is BaseCCForwarderTest {
     validateTransactionNonceIncrement
     validateTransactionRegistry(extendedTx)
   {
+    _mockAdaptersForwardMessage(extendedTx.envelope.destinationChainId);
     UsedAdapter[] memory usedAdapters = _currentlyUsedAdaptersByChain[
       extendedTx.envelope.destinationChainId
     ];