diff --git a/CLAUDE.md b/CLAUDE.md
index 86212f8..d76f2fe 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -12,11 +12,14 @@
 ## Fork Testing Setup
 
 ```bash
+# Fork tests use the 'optimism' RPC alias from foundry.toml (uses Infura)
+# Ensure .common.env has API_KEY_INFURA set
 source .common.env && source .optimism.env
-export OPTIMISM_RPC_URL=https://optimism-rpc.publicnode.com
 forge test --force  # --force required for OpenZeppelin plugin
 ```
 
+**Note:** Fork tests use `vm.createSelectFork("optimism", blockNumber)` which references the `optimism` RPC alias in `foundry.toml`. This automatically uses your Infura API key from `.common.env`.
+
 ## Critical System Constraints
 
 ### Token Supply Limits
diff --git a/evm/test/fork/l2wct/ntt-storage-compatibility.sol b/evm/test/fork/l2wct/ntt-storage-compatibility.sol
index 8545030..32df3b7 100644
--- a/evm/test/fork/l2wct/ntt-storage-compatibility.sol
+++ b/evm/test/fork/l2wct/ntt-storage-compatibility.sol
@@ -20,8 +20,8 @@ contract L2WCT_StorageCompatibility_ForkTest is Base_Test {
     address public opBridge;
 
     function setUp() public override {
-        // Fork Optimism mainnet at specific block
-        vm.createSelectFork(vm.envString("OPTIMISM_RPC_URL"), FORK_BLOCK);
+        // Fork Optimism mainnet at specific block (uses foundry.toml RPC alias)
+        vm.createSelectFork("optimism", FORK_BLOCK);
 
         // Set the chain ID to match Optimism mainnet
         vm.chainId(OPTIMISM_CHAIN_ID);