diff --git a/target_chains/ethereum/contracts/README.md b/target_chains/ethereum/contracts/README.md
index 6477b3d066..cb3460583f 100644
--- a/target_chains/ethereum/contracts/README.md
+++ b/target_chains/ethereum/contracts/README.md
@@ -28,7 +28,7 @@ pnpm turbo build --filter @pythnetwork/pyth-evm-contract
 ## Testing
 
 Run `forge build` to build the contracts and `forge test` to run the contract unit tests.
-The unit tests live in the `forge-test` directory.
+The unit tests live in the `test` directory.
 
 ### Code Coverage
 
diff --git a/target_chains/ethereum/contracts/contracts/pulse/README.md b/target_chains/ethereum/contracts/contracts/pulse/README.md
index 58f7c47275..1a2c428092 100644
--- a/target_chains/ethereum/contracts/contracts/pulse/README.md
+++ b/target_chains/ethereum/contracts/contracts/pulse/README.md
@@ -9,7 +9,7 @@ Pulse replaces the service formerly known as "scheduler" or "price pusher," and
 ## Build and Test
 
 Run `forge build` to build the contracts and `forge test` to run the contract unit tests.
-The unit tests live in the `../../forge-test` directory.
+The unit tests live in the `../../test` directory.
 
 Gas benchmarks that cover the most frequent usage patterns are in `PulseSchedulerGasBenchmark.t.sol`. Run the benchmark with -vv to to see the gas usage for the operations under test, without setup costs.
 
diff --git a/target_chains/ethereum/contracts/foundry.toml b/target_chains/ethereum/contracts/foundry.toml
index 96e2eba8ce..e37f760135 100644
--- a/target_chains/ethereum/contracts/foundry.toml
+++ b/target_chains/ethereum/contracts/foundry.toml
@@ -4,8 +4,8 @@ evm_version = "paris"
 optimizer = true
 optimizer_runs = 200
 src = 'contracts'
-# Tests are in the forge-test directory
-test = 'forge-test'
+# Tests are in the test directory
+test = 'test'
 
 libs = ['lib', 'node_modules']
 
diff --git a/target_chains/ethereum/contracts/forge-test/Echo.t.sol b/target_chains/ethereum/contracts/test/Echo.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/Echo.t.sol
rename to target_chains/ethereum/contracts/test/Echo.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/EchoGasBenchmark.t.sol b/target_chains/ethereum/contracts/test/EchoGasBenchmark.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/EchoGasBenchmark.t.sol
rename to target_chains/ethereum/contracts/test/EchoGasBenchmark.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/Entropy.t.sol b/target_chains/ethereum/contracts/test/Entropy.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/Entropy.t.sol
rename to target_chains/ethereum/contracts/test/Entropy.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/EntropyAuthorized.t.sol b/target_chains/ethereum/contracts/test/EntropyAuthorized.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/EntropyAuthorized.t.sol
rename to target_chains/ethereum/contracts/test/EntropyAuthorized.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/EntropyGasBenchmark.t.sol b/target_chains/ethereum/contracts/test/EntropyGasBenchmark.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/EntropyGasBenchmark.t.sol
rename to target_chains/ethereum/contracts/test/EntropyGasBenchmark.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/Executor.t.sol b/target_chains/ethereum/contracts/test/Executor.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/Executor.t.sol
rename to target_chains/ethereum/contracts/test/Executor.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/GasBenchmark.t.sol b/target_chains/ethereum/contracts/test/GasBenchmark.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/GasBenchmark.t.sol
rename to target_chains/ethereum/contracts/test/GasBenchmark.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/PRNG.t.sol b/target_chains/ethereum/contracts/test/PRNG.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/PRNG.t.sol
rename to target_chains/ethereum/contracts/test/PRNG.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/PulseScheduler.t.sol b/target_chains/ethereum/contracts/test/PulseScheduler.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/PulseScheduler.t.sol
rename to target_chains/ethereum/contracts/test/PulseScheduler.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/PulseSchedulerGasBenchmark.t.sol b/target_chains/ethereum/contracts/test/PulseSchedulerGasBenchmark.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/PulseSchedulerGasBenchmark.t.sol
rename to target_chains/ethereum/contracts/test/PulseSchedulerGasBenchmark.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/PulseSchedulerGovernance.t.sol b/target_chains/ethereum/contracts/test/PulseSchedulerGovernance.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/PulseSchedulerGovernance.t.sol
rename to target_chains/ethereum/contracts/test/PulseSchedulerGovernance.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/Pyth.Aave.t.sol b/target_chains/ethereum/contracts/test/Pyth.Aave.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/Pyth.Aave.t.sol
rename to target_chains/ethereum/contracts/test/Pyth.Aave.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/Pyth.WormholeMerkleAccumulator.t.sol b/target_chains/ethereum/contracts/test/Pyth.WormholeMerkleAccumulator.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/Pyth.WormholeMerkleAccumulator.t.sol
rename to target_chains/ethereum/contracts/test/Pyth.WormholeMerkleAccumulator.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/Pyth.t.sol b/target_chains/ethereum/contracts/test/Pyth.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/Pyth.t.sol
rename to target_chains/ethereum/contracts/test/Pyth.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/PythGovernance.t.sol b/target_chains/ethereum/contracts/test/PythGovernance.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/PythGovernance.t.sol
rename to target_chains/ethereum/contracts/test/PythGovernance.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/VerificationExperiments.t.sol b/target_chains/ethereum/contracts/test/VerificationExperiments.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/VerificationExperiments.t.sol
rename to target_chains/ethereum/contracts/test/VerificationExperiments.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/utils/EchoTestUtils.sol b/target_chains/ethereum/contracts/test/utils/EchoTestUtils.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/utils/EchoTestUtils.sol
rename to target_chains/ethereum/contracts/test/utils/EchoTestUtils.sol
diff --git a/target_chains/ethereum/contracts/forge-test/utils/EntropyTestUtils.t.sol b/target_chains/ethereum/contracts/test/utils/EntropyTestUtils.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/utils/EntropyTestUtils.t.sol
rename to target_chains/ethereum/contracts/test/utils/EntropyTestUtils.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/utils/InvalidMagic.t.sol b/target_chains/ethereum/contracts/test/utils/InvalidMagic.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/utils/InvalidMagic.t.sol
rename to target_chains/ethereum/contracts/test/utils/InvalidMagic.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/utils/MockPriceFeedTestUtils.sol b/target_chains/ethereum/contracts/test/utils/MockPriceFeedTestUtils.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/utils/MockPriceFeedTestUtils.sol
rename to target_chains/ethereum/contracts/test/utils/MockPriceFeedTestUtils.sol
diff --git a/target_chains/ethereum/contracts/forge-test/utils/PulseSchedulerTestUtils.t.sol b/target_chains/ethereum/contracts/test/utils/PulseSchedulerTestUtils.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/utils/PulseSchedulerTestUtils.t.sol
rename to target_chains/ethereum/contracts/test/utils/PulseSchedulerTestUtils.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/utils/PythTestUtils.t.sol b/target_chains/ethereum/contracts/test/utils/PythTestUtils.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/utils/PythTestUtils.t.sol
rename to target_chains/ethereum/contracts/test/utils/PythTestUtils.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/utils/RandTestUtils.t.sol b/target_chains/ethereum/contracts/test/utils/RandTestUtils.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/utils/RandTestUtils.t.sol
rename to target_chains/ethereum/contracts/test/utils/RandTestUtils.t.sol
diff --git a/target_chains/ethereum/contracts/forge-test/utils/WormholeTestUtils.t.sol b/target_chains/ethereum/contracts/test/utils/WormholeTestUtils.t.sol
similarity index 100%
rename from target_chains/ethereum/contracts/forge-test/utils/WormholeTestUtils.t.sol
rename to target_chains/ethereum/contracts/test/utils/WormholeTestUtils.t.sol