diff --git a/packages/hardhat/test/foundry/Curve.t.sol b/packages/hardhat/test/foundry/Curve.t.sol
index 68c18605..8dda3af0 100644
--- a/packages/hardhat/test/foundry/Curve.t.sol
+++ b/packages/hardhat/test/foundry/Curve.t.sol
@@ -22,9 +22,7 @@ contract CurveTest is FacetTest, CurveHelpers, ILibStarVault {
   ICurve internal facet;
 
   function setUp() public override {
-    vm.createSelectFork(StdChains.getChain(1).rpcUrl, 17853419);
-
-    super.setUp();
+    setUpOn(Mainnet.CHAIN_ID, 17853419);
 
     IDiamondCut.FacetCut[] memory facetCuts = new IDiamondCut.FacetCut[](1);
 
diff --git a/packages/hardhat/test/foundry/StarVault.t.sol b/packages/hardhat/test/foundry/StarVault.t.sol
index 0cce0db8..a1070c2e 100644
--- a/packages/hardhat/test/foundry/StarVault.t.sol
+++ b/packages/hardhat/test/foundry/StarVault.t.sol
@@ -44,9 +44,7 @@ contract StarVaultTest is FacetTest {
   }
 
   function setUp() public override {
-    vm.createSelectFork(StdChains.getChain(1).rpcUrl, 17853419);
-
-    super.setUp();
+    setUpOn(Mainnet.CHAIN_ID, 17853419);
 
     // Add StarVault to diamond
     IDiamondCut.FacetCut[] memory facetCuts = new IDiamondCut.FacetCut[](1);
diff --git a/packages/hardhat/test/foundry/Stargate.t.sol b/packages/hardhat/test/foundry/Stargate.t.sol
index 0d248eda..f2f4ae40 100644
--- a/packages/hardhat/test/foundry/Stargate.t.sol
+++ b/packages/hardhat/test/foundry/Stargate.t.sol
@@ -47,8 +47,7 @@ abstract contract StargateTestBase is FacetTest {
 contract StargateMainnetTest is StargateTestBase {
   function setUp() public override {
     // NOTE: This is the same block number as the WarpLink Stargate tests
-
-    super.setUpOn(1, 18331782);
+    setUpOn(Mainnet.CHAIN_ID, 18331782);
   }
 
   function testFork_stargateJumpTokens_Usdc() public {
diff --git a/packages/hardhat/test/foundry/UniV2LikeFacet.t.sol b/packages/hardhat/test/foundry/UniV2LikeFacet.t.sol
index c2c52293..88f83397 100644
--- a/packages/hardhat/test/foundry/UniV2LikeFacet.t.sol
+++ b/packages/hardhat/test/foundry/UniV2LikeFacet.t.sol
@@ -62,7 +62,7 @@ contract UniV2LikeFacetTestBase is FacetTest {
 
 contract UniV2LikeFacetTest is UniV2LikeFacetTestBase {
   function setUp() public override {
-    super.setUpOn(1, 17853419);
+    setUpOn(Mainnet.CHAIN_ID, 17853419);
   }
 
   function testFork_uniswapV2LikeExactInputSingle_sushiEthToUsdc() public {
@@ -402,7 +402,7 @@ contract UniV2LikeFacetTest is UniV2LikeFacetTestBase {
 
 contract UniV2LikeFacetArbitrumTest is UniV2LikeFacetTestBase {
   function setUp() public override {
-    super.setUpOn(42161, 130346515);
+    setUpOn(Arbitrum.CHAIN_ID, 130346515);
   }
 
   function testFork_uniswapV2LikeExactInputSingle() public {
diff --git a/packages/hardhat/test/foundry/UniV2RouterFacet.t.sol b/packages/hardhat/test/foundry/UniV2RouterFacet.t.sol
index 09a9110b..daf1159b 100644
--- a/packages/hardhat/test/foundry/UniV2RouterFacet.t.sol
+++ b/packages/hardhat/test/foundry/UniV2RouterFacet.t.sol
@@ -51,7 +51,7 @@ contract UniV2RouterFacetTestBase is FacetTest, ILibStarVault {
 
 contract UniV2RouterFacetTest is UniV2RouterFacetTestBase {
   function setUp() public override {
-    super.setUpOn(1, 17853419);
+    setUpOn(Mainnet.CHAIN_ID, 17853419);
   }
 
   function testFork_uniswapV2ExactInputSingle_EthForUsdc_PositiveSlippage() public {
diff --git a/packages/hardhat/test/foundry/UniV3Like.t.sol b/packages/hardhat/test/foundry/UniV3Like.t.sol
index 5ac4eee2..8720207b 100644
--- a/packages/hardhat/test/foundry/UniV3Like.t.sol
+++ b/packages/hardhat/test/foundry/UniV3Like.t.sol
@@ -54,7 +54,7 @@ abstract contract UniV3LikeTestBase is FacetTest {
 
 contract UniV3LikeMainnetTest is UniV3LikeTestBase {
   function setUp() public override {
-    super.setUpOn(1, 17853419);
+    setUpOn(Mainnet.CHAIN_ID, 17853419);
   }
 
   function testFork_uniswapV3LikeExactInputSingle_UsdcToUsdt() public {
diff --git a/packages/hardhat/test/foundry/WarpLink/Arbitrum.t.sol b/packages/hardhat/test/foundry/WarpLink/Arbitrum.t.sol
index d00e4d90..ecb631f3 100644
--- a/packages/hardhat/test/foundry/WarpLink/Arbitrum.t.sol
+++ b/packages/hardhat/test/foundry/WarpLink/Arbitrum.t.sol
@@ -12,7 +12,7 @@ import {WarpLinkTestBase} from './TestBase.sol';
 
 contract WarpLinkArbitrumTest is WarpLinkTestBase {
   function setUp() public override {
-    setUpOn(42161, 130346515);
+    setUpOn(Arbitrum.CHAIN_ID, 130346515);
   }
 
   function testFork_warpLinkEngage_Wrap() public {
diff --git a/packages/hardhat/test/foundry/WarpLink/Mainnet-17853419.t.sol b/packages/hardhat/test/foundry/WarpLink/Mainnet-17853419.t.sol
index 1c3d861e..f113caee 100644
--- a/packages/hardhat/test/foundry/WarpLink/Mainnet-17853419.t.sol
+++ b/packages/hardhat/test/foundry/WarpLink/Mainnet-17853419.t.sol
@@ -14,7 +14,7 @@ import {WarpLinkTestBase} from './TestBase.sol';
 
 contract WarpLinkMainnet17853419Test is WarpLinkTestBase, CurveHelpers {
   function setUp() public override {
-    setUpOn(1, 17853419);
+    setUpOn(Mainnet.CHAIN_ID, 17853419);
   }
 
   function testFork_warpLinkEngage_Wrap() public {
diff --git a/packages/hardhat/test/foundry/WarpLink/Mainnet-18069811.t.sol b/packages/hardhat/test/foundry/WarpLink/Mainnet-18069811.t.sol
index 89a1c15f..0ecf6f09 100644
--- a/packages/hardhat/test/foundry/WarpLink/Mainnet-18069811.t.sol
+++ b/packages/hardhat/test/foundry/WarpLink/Mainnet-18069811.t.sol
@@ -11,7 +11,7 @@ import {WarpLinkTestBase} from './TestBase.sol';
 
 contract WarpLinkMainnet18069811Test is WarpLinkTestBase {
   function setUp() public override {
-    setUpOn(1, 18069811);
+    setUpOn(Mainnet.CHAIN_ID, 18069811);
   }
 
   function testFork_warpLinkEngagePermit_paraswapVector() public {
diff --git a/packages/hardhat/test/foundry/WarpLink/Mainnet-18240282.t.sol b/packages/hardhat/test/foundry/WarpLink/Mainnet-18240282.t.sol
index 1fb32052..f4c49bc6 100644
--- a/packages/hardhat/test/foundry/WarpLink/Mainnet-18240282.t.sol
+++ b/packages/hardhat/test/foundry/WarpLink/Mainnet-18240282.t.sol
@@ -16,7 +16,7 @@ import {IStargateComposer} from '../helpers/IStargateComposer.sol';
 // Stargate switched to requiring the composer
 contract WarpLinkMainnet18240282Test is WarpLinkTestBase {
   function setUp() public override {
-    setUpOn(1, 18240282);
+    setUpOn(Mainnet.CHAIN_ID, 18240282);
   }
 
   function testFork_warpLinkEngage_jumpStargate_EthToUsdc() public {
diff --git a/packages/hardhat/test/foundry/WarpLink/Polygon.t.sol b/packages/hardhat/test/foundry/WarpLink/Polygon.t.sol
index 91f0d03f..c0114d08 100644
--- a/packages/hardhat/test/foundry/WarpLink/Polygon.t.sol
+++ b/packages/hardhat/test/foundry/WarpLink/Polygon.t.sol
@@ -12,7 +12,7 @@ import {WarpLinkTestBase} from './TestBase.sol';
 
 contract WarpLinkPolygonTest is WarpLinkTestBase {
   function setUp() public override {
-    setUpOn(137, 47436715);
+    setUpOn(Polygon.CHAIN_ID, 47436715);
   }
 
   function testFork_Wrap() public {