diff --git a/contracts/test/token/ERC20/TestEncryptedERC20Wrapped.sol b/contracts/test/token/ERC20/TestEncryptedERC20Wrapped.sol
index ef35867..50d1fad 100644
--- a/contracts/test/token/ERC20/TestEncryptedERC20Wrapped.sol
+++ b/contracts/test/token/ERC20/TestEncryptedERC20Wrapped.sol
@@ -2,11 +2,9 @@
 pragma solidity ^0.8.24;
 
 import { EncryptedERC20Wrapped } from "../../../token/ERC20/EncryptedERC20Wrapped.sol";
-import { DefaultFHEVMConfig } from "../../DefaultFHEVMConfig.sol";
-import { DefaultGatewayConfig } from "../../DefaultGatewayConfig.sol";
+import { MockZamaFHEVMConfig } from "fhevm/config/ZamaFHEVMConfig.sol";
+import { MockZamaGatewayConfig } from "fhevm/config/ZamaGatewayConfig.sol";
 
-contract TestEncryptedERC20Wrapped is DefaultFHEVMConfig, DefaultGatewayConfig, EncryptedERC20Wrapped {
-    constructor(address erc20_) EncryptedERC20Wrapped(erc20_) {
-        //
-    }
+contract TestEncryptedERC20Wrapped is MockZamaFHEVMConfig, MockZamaGatewayConfig, EncryptedERC20Wrapped {
+    constructor(address erc20_) EncryptedERC20Wrapped(erc20_) {}
 }
diff --git a/contracts/test/token/ERC20/TestEncryptedWETH.sol b/contracts/test/token/ERC20/TestEncryptedWETH.sol
index 7f8e752..1bc4ebc 100644
--- a/contracts/test/token/ERC20/TestEncryptedWETH.sol
+++ b/contracts/test/token/ERC20/TestEncryptedWETH.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.24;
 
 import { EncryptedWETH } from "../../../token/ERC20/EncryptedWETH.sol";
-import { DefaultFHEVMConfig } from "../../DefaultFHEVMConfig.sol";
-import { DefaultGatewayConfig } from "../../DefaultGatewayConfig.sol";
+import { MockZamaFHEVMConfig } from "fhevm/config/ZamaFHEVMConfig.sol";
+import { MockZamaGatewayConfig } from "fhevm/config/ZamaGatewayConfig.sol";
 
 /* solhint-disable no-empty-blocks*/
-contract TestEncryptedWETH is DefaultFHEVMConfig, DefaultGatewayConfig, EncryptedWETH {}
+contract TestEncryptedWETH is MockZamaFHEVMConfig, MockZamaGatewayConfig, EncryptedWETH {}