diff --git a/test/instances/aave/AaveHyperdrive.t.sol b/test/instances/aave/AaveHyperdrive.t.sol
index 63b6c1ff5..b97fa39e7 100644
--- a/test/instances/aave/AaveHyperdrive.t.sol
+++ b/test/instances/aave/AaveHyperdrive.t.sol
@@ -11,16 +11,10 @@ import { AaveTarget1Deployer } from "../../../contracts/src/deployers/aave/AaveT
 import { AaveTarget2Deployer } from "../../../contracts/src/deployers/aave/AaveTarget2Deployer.sol";
 import { AaveTarget3Deployer } from "../../../contracts/src/deployers/aave/AaveTarget3Deployer.sol";
 import { AaveTarget4Deployer } from "../../../contracts/src/deployers/aave/AaveTarget4Deployer.sol";
-import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol";
 import { IAToken } from "../../../contracts/src/interfaces/IAToken.sol";
 import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol";
 import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol";
-import { AssetId } from "../../../contracts/src/libraries/AssetId.sol";
-import { ETH } from "../../../contracts/src/libraries/Constants.sol";
-import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol";
-import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol";
-import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol";
-import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol";
+import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol";
 import { InstanceTest } from "../../utils/InstanceTest.sol";
 import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol";
 import { Lib } from "../../utils/Lib.sol";
diff --git a/test/instances/reth/RETHHyperdrive.t.sol b/test/instances/reth/RETHHyperdrive.t.sol
index fa992efb4..af3f35df5 100644
--- a/test/instances/reth/RETHHyperdrive.t.sol
+++ b/test/instances/reth/RETHHyperdrive.t.sol
@@ -2,19 +2,12 @@
 pragma solidity 0.8.20;
 
 import { stdStorage, StdStorage } from "forge-std/Test.sol";
-import { AssetId } from "../../../contracts/src/libraries/AssetId.sol";
-import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol";
-import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol";
 import { ETH } from "../../../contracts/src/libraries/Constants.sol";
-import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol";
-import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol";
-import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol";
+import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol";
 import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol";
 import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol";
-import { IRETHHyperdrive } from "../../../contracts/src/interfaces/IRETHHyperdrive.sol";
 import { IRocketDepositPool } from "../../../contracts/src/interfaces/IRocketDepositPool.sol";
 import { IRocketNetworkBalances } from "../../../contracts/src/interfaces/IRocketNetworkBalances.sol";
-import { IRocketPoolDAOProtocolSettingsDeposit } from "../../../contracts/src/interfaces/IRocketPoolDAOProtocolSettingsDeposit.sol";
 import { IRocketStorage } from "../../../contracts/src/interfaces/IRocketStorage.sol";
 import { IRocketTokenRETH } from "../../../contracts/src/interfaces/IRocketTokenRETH.sol";
 import { RETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/reth/RETHHyperdriveCoreDeployer.sol";
diff --git a/test/integrations/hyperdrive/ZombieInterestTest.t.sol b/test/integrations/hyperdrive/ZombieInterestTest.t.sol
index 91ea8630b..4c5f97b21 100644
--- a/test/integrations/hyperdrive/ZombieInterestTest.t.sol
+++ b/test/integrations/hyperdrive/ZombieInterestTest.t.sol
@@ -1,10 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity 0.8.20;
 
-import { AssetId } from "../../../contracts/src/libraries/AssetId.sol";
 import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol";
-import { MockHyperdrive, IMockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol";
-import { HyperdriveTest, HyperdriveUtils, IHyperdrive } from "../../utils/HyperdriveTest.sol";
+import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol";
 import { Lib } from "../../utils/Lib.sol";
 
 contract ZombieInterestTest is HyperdriveTest {