diff --git a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
index 54c87616e1762..c99ea77357fa8 100644
--- a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
+++ b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.15;
 import { Test, stdStorage, StdStorage } from "forge-std/Test.sol";
 
 import { DeployOPChainInput } from "scripts/DeployOPChain.s.sol";
-import { DeployOPChain_TestBase } from "test/DeployOPChain.t.sol";
+import { DeployOPChain_TestBase } from "test/opcm/DeployOPChain.t.sol";
 
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
 import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";
diff --git a/packages/contracts-bedrock/test/DeployAuthSystem.t.sol b/packages/contracts-bedrock/test/opcm/DeployAuthSystem.t.sol
similarity index 100%
rename from packages/contracts-bedrock/test/DeployAuthSystem.t.sol
rename to packages/contracts-bedrock/test/opcm/DeployAuthSystem.t.sol
diff --git a/packages/contracts-bedrock/test/DeployImplementations.t.sol b/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
similarity index 100%
rename from packages/contracts-bedrock/test/DeployImplementations.t.sol
rename to packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
diff --git a/packages/contracts-bedrock/test/DeployOPChain.t.sol b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
similarity index 100%
rename from packages/contracts-bedrock/test/DeployOPChain.t.sol
rename to packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
diff --git a/packages/contracts-bedrock/test/DeploySuperchain.t.sol b/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol
similarity index 100%
rename from packages/contracts-bedrock/test/DeploySuperchain.t.sol
rename to packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol