diff --git a/.github/workflows/solidity-foundry.yml b/.github/workflows/solidity-foundry.yml
index d88de60a38b..588e736c19a 100644
--- a/.github/workflows/solidity-foundry.yml
+++ b/.github/workflows/solidity-foundry.yml
@@ -21,7 +21,6 @@ jobs:
           filters: |
             src:
               - 'contracts/src/v0.8/**/*'
-              - 'contracts/test/v0.8/foundry/**/*'
               - '.github/workflows/solidity-foundry.yml'
               - 'contracts/foundry.toml'
               - 'contracts/gas-snapshots/*.gas-snapshot'
diff --git a/contracts/.changeset/lucky-bananas-kneel.md b/contracts/.changeset/lucky-bananas-kneel.md
new file mode 100644
index 00000000000..2c2b8d5b321
--- /dev/null
+++ b/contracts/.changeset/lucky-bananas-kneel.md
@@ -0,0 +1,5 @@
+---
+"@chainlink/contracts": patch
+---
+
+mv vrf foundry tests
diff --git a/contracts/foundry.toml b/contracts/foundry.toml
index 2efe1c13058..6f879c9217b 100644
--- a/contracts/foundry.toml
+++ b/contracts/foundry.toml
@@ -4,7 +4,7 @@ optimizer = true
 optimizer_runs = 1_000_000
 
 src = 'src/v0.8'
-test = 'test/v0.8/foundry'
+test = 'test/v0.8'
 out = 'foundry-artifacts'
 cache_path  = 'foundry-cache'
 libs = ['node_modules', 'foundry-lib']
@@ -25,7 +25,7 @@ gas_price = 3_000_000_000 # 3 gwei
 [profile.vrf]
 optimizer_runs = 1_000
 src = 'src/v0.8/vrf'
-test = 'test/v0.8/foundry/vrf' # skips tests for no VRF foundry tests
+test = 'src/v0.8/vrf/test'
 
 [profile.vrfv2plus_coordinator]
 optimizer_runs = 500
@@ -51,7 +51,6 @@ optimizer_runs = 1_000_000
 src = 'src/v0.8/llo-feeds'
 test = 'src/v0.8/llo-feeds/test'
 solc_version = '0.8.19'
-# We cannot turn on deny_warnings = true as that will hide any CI failure
 
 [profile.keystone]
 solc_version = '0.8.19'
diff --git a/contracts/test/v0.8/foundry/BaseTest.t.sol b/contracts/src/v0.8/vrf/test/BaseTest.t.sol
similarity index 100%
rename from contracts/test/v0.8/foundry/BaseTest.t.sol
rename to contracts/src/v0.8/vrf/test/BaseTest.t.sol
diff --git a/contracts/test/v0.8/foundry/vrf/ChainSpecificUtil.t.sol b/contracts/src/v0.8/vrf/test/ChainSpecificUtil.t.sol
similarity index 94%
rename from contracts/test/v0.8/foundry/vrf/ChainSpecificUtil.t.sol
rename to contracts/src/v0.8/vrf/test/ChainSpecificUtil.t.sol
index eaf76610054..efeb9027462 100644
--- a/contracts/test/v0.8/foundry/vrf/ChainSpecificUtil.t.sol
+++ b/contracts/src/v0.8/vrf/test/ChainSpecificUtil.t.sol
@@ -1,10 +1,11 @@
 pragma solidity 0.8.6;
 
-import "../BaseTest.t.sol";
-import {ChainSpecificUtil} from "../../../../src/v0.8/ChainSpecificUtil_v0_8_6.sol";
-import {ArbSys} from "../../../../src/v0.8/vendor/@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
-import {ArbGasInfo} from "../../../../src/v0.8/vendor/@arbitrum/nitro-contracts/src/precompiles/ArbGasInfo.sol";
-import {OVM_GasPriceOracle} from "../../../../src/v0.8/vendor/@eth-optimism/contracts/v0.8.6/contracts/L2/predeploys/OVM_GasPriceOracle.sol";
+import "./BaseTest.t.sol";
+import {ChainSpecificUtil} from "../../ChainSpecificUtil_v0_8_6.sol";
+
+import {ArbSys} from "../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
+import {ArbGasInfo} from "../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbGasInfo.sol";
+import {OVM_GasPriceOracle} from "../../vendor/@eth-optimism/contracts/v0.8.6/contracts/L2/predeploys/OVM_GasPriceOracle.sol";
 
 contract ChainSpecificUtilTest is BaseTest {
   // ------------ Start Arbitrum Constants ------------
diff --git a/contracts/test/v0.8/foundry/vrf/TrustedBlockhashStore.t.sol b/contracts/src/v0.8/vrf/test/TrustedBlockhashStore.t.sol
similarity index 96%
rename from contracts/test/v0.8/foundry/vrf/TrustedBlockhashStore.t.sol
rename to contracts/src/v0.8/vrf/test/TrustedBlockhashStore.t.sol
index 4f79cb4f071..ec47f4815d9 100644
--- a/contracts/test/v0.8/foundry/vrf/TrustedBlockhashStore.t.sol
+++ b/contracts/src/v0.8/vrf/test/TrustedBlockhashStore.t.sol
@@ -1,7 +1,7 @@
 pragma solidity 0.8.19;
 
-import "../BaseTest.t.sol";
-import {TrustedBlockhashStore} from "../../../../src/v0.8/vrf/dev/TrustedBlockhashStore.sol";
+import "./BaseTest.t.sol";
+import {TrustedBlockhashStore} from "../dev/TrustedBlockhashStore.sol";
 import {console} from "forge-std/console.sol";
 
 contract TrustedBlockhashStoreTest is BaseTest {
diff --git a/contracts/test/v0.8/foundry/vrf/VRFCoordinatorV2Mock.t.sol b/contracts/src/v0.8/vrf/test/VRFCoordinatorV2Mock.t.sol
similarity index 96%
rename from contracts/test/v0.8/foundry/vrf/VRFCoordinatorV2Mock.t.sol
rename to contracts/src/v0.8/vrf/test/VRFCoordinatorV2Mock.t.sol
index 6378d40167b..1716118b765 100644
--- a/contracts/test/v0.8/foundry/vrf/VRFCoordinatorV2Mock.t.sol
+++ b/contracts/src/v0.8/vrf/test/VRFCoordinatorV2Mock.t.sol
@@ -1,11 +1,11 @@
 pragma solidity 0.8.6;
 
-import "../BaseTest.t.sol";
-import {VRF} from "../../../../src/v0.8/vrf/VRF.sol";
-import {MockLinkToken} from "../../../../src/v0.8/mocks/MockLinkToken.sol";
-import {MockV3Aggregator} from "../../../../src/v0.8/tests/MockV3Aggregator.sol";
-import {VRFCoordinatorV2Mock} from "../../../../src/v0.8/vrf/mocks/VRFCoordinatorV2Mock.sol";
-import {VRFConsumerV2} from "../../../../src/v0.8/vrf/testhelpers/VRFConsumerV2.sol";
+import "./BaseTest.t.sol";
+import {VRF} from "../VRF.sol";
+import {MockLinkToken} from "../../mocks/MockLinkToken.sol";
+import {MockV3Aggregator} from "../../tests/MockV3Aggregator.sol";
+import {VRFCoordinatorV2Mock} from "../mocks/VRFCoordinatorV2Mock.sol";
+import {VRFConsumerV2} from "../testhelpers/VRFConsumerV2.sol";
 
 contract VRFCoordinatorV2MockTest is BaseTest {
   MockLinkToken internal s_linkToken;
diff --git a/contracts/test/v0.8/foundry/vrf/VRFCoordinatorV2Plus_Migration.t.sol b/contracts/src/v0.8/vrf/test/VRFCoordinatorV2Plus_Migration.t.sol
similarity index 94%
rename from contracts/test/v0.8/foundry/vrf/VRFCoordinatorV2Plus_Migration.t.sol
rename to contracts/src/v0.8/vrf/test/VRFCoordinatorV2Plus_Migration.t.sol
index 9b183db3ddc..31585656b37 100644
--- a/contracts/test/v0.8/foundry/vrf/VRFCoordinatorV2Plus_Migration.t.sol
+++ b/contracts/src/v0.8/vrf/test/VRFCoordinatorV2Plus_Migration.t.sol
@@ -1,14 +1,14 @@
 pragma solidity 0.8.19;
 
-import "../BaseTest.t.sol";
-import {VRFCoordinatorV2Plus_V2Example} from "../../../../src/v0.8/vrf/dev/testhelpers/VRFCoordinatorV2Plus_V2Example.sol";
-import {ExposedVRFCoordinatorV2_5} from "../../../../src/v0.8/vrf/dev/testhelpers/ExposedVRFCoordinatorV2_5.sol";
-import {VRFCoordinatorV2_5} from "../../../../src/v0.8/vrf/dev/VRFCoordinatorV2_5.sol";
-import {SubscriptionAPI} from "../../../../src/v0.8/vrf/dev/SubscriptionAPI.sol";
-import {VRFV2PlusConsumerExample} from "../../../../src/v0.8/vrf/dev/testhelpers/VRFV2PlusConsumerExample.sol";
-import {MockLinkToken} from "../../../../src/v0.8/mocks/MockLinkToken.sol";
-import {MockV3Aggregator} from "../../../../src/v0.8/tests/MockV3Aggregator.sol";
-import {VRFV2PlusMaliciousMigrator} from "../../../../src/v0.8/vrf/dev/testhelpers/VRFV2PlusMaliciousMigrator.sol";
+import "./BaseTest.t.sol";
+import {VRFCoordinatorV2Plus_V2Example} from "../dev/testhelpers/VRFCoordinatorV2Plus_V2Example.sol";
+import {ExposedVRFCoordinatorV2_5} from "../dev/testhelpers/ExposedVRFCoordinatorV2_5.sol";
+import {VRFCoordinatorV2_5} from "../dev/VRFCoordinatorV2_5.sol";
+import {SubscriptionAPI} from "../dev/SubscriptionAPI.sol";
+import {VRFV2PlusConsumerExample} from "../dev/testhelpers/VRFV2PlusConsumerExample.sol";
+import {MockLinkToken} from "../../mocks/MockLinkToken.sol";
+import {MockV3Aggregator} from "../../tests/MockV3Aggregator.sol";
+import {VRFV2PlusMaliciousMigrator} from "../dev/testhelpers/VRFV2PlusMaliciousMigrator.sol";
 
 contract VRFCoordinatorV2Plus_Migration is BaseTest {
   uint256 internal constant DEFAULT_LINK_FUNDING = 10 ether; // 10 LINK
diff --git a/contracts/test/v0.8/foundry/vrf/VRFV2Plus.t.sol b/contracts/src/v0.8/vrf/test/VRFV2Plus.t.sol
similarity index 98%
rename from contracts/test/v0.8/foundry/vrf/VRFV2Plus.t.sol
rename to contracts/src/v0.8/vrf/test/VRFV2Plus.t.sol
index 241a06c1359..b7c2c1f882e 100644
--- a/contracts/test/v0.8/foundry/vrf/VRFV2Plus.t.sol
+++ b/contracts/src/v0.8/vrf/test/VRFV2Plus.t.sol
@@ -1,19 +1,19 @@
 pragma solidity 0.8.19;
 
-import "../BaseTest.t.sol";
-import {VRF} from "../../../../src/v0.8/vrf/VRF.sol";
-import {MockLinkToken} from "../../../../src/v0.8/mocks/MockLinkToken.sol";
-import {MockV3Aggregator} from "../../../../src/v0.8/tests/MockV3Aggregator.sol";
-import {ExposedVRFCoordinatorV2_5} from "../../../../src/v0.8/vrf/dev/testhelpers/ExposedVRFCoordinatorV2_5.sol";
-import {VRFCoordinatorV2_5} from "../../../../src/v0.8/vrf/dev/VRFCoordinatorV2_5.sol";
-import {SubscriptionAPI} from "../../../../src/v0.8/vrf/dev/SubscriptionAPI.sol";
-import {BlockhashStore} from "../../../../src/v0.8/vrf/dev/BlockhashStore.sol";
-import {VRFV2PlusConsumerExample} from "../../../../src/v0.8/vrf/dev/testhelpers/VRFV2PlusConsumerExample.sol";
-import {VRFV2PlusClient} from "../../../../src/v0.8/vrf/dev/libraries/VRFV2PlusClient.sol";
-import {VRFTypes} from "../../../../src/v0.8/vrf/VRFTypes.sol";
+import "./BaseTest.t.sol";
+import {VRF} from "../VRF.sol";
+import {MockLinkToken} from "../../mocks/MockLinkToken.sol";
+import {MockV3Aggregator} from "../../tests/MockV3Aggregator.sol";
+import {ExposedVRFCoordinatorV2_5} from "../dev/testhelpers/ExposedVRFCoordinatorV2_5.sol";
+import {VRFCoordinatorV2_5} from "../dev/VRFCoordinatorV2_5.sol";
+import {SubscriptionAPI} from "../dev/SubscriptionAPI.sol";
+import {BlockhashStore} from "../dev/BlockhashStore.sol";
+import {VRFV2PlusConsumerExample} from "../dev/testhelpers/VRFV2PlusConsumerExample.sol";
+import {VRFV2PlusClient} from "../dev/libraries/VRFV2PlusClient.sol";
+import {VRFTypes} from "../VRFTypes.sol";
 import {console} from "forge-std/console.sol";
 import {VmSafe} from "forge-std/Vm.sol";
-import {VRFV2PlusLoadTestWithMetrics} from "../../../../src/v0.8/vrf/dev/testhelpers/VRFV2PlusLoadTestWithMetrics.sol";
+import {VRFV2PlusLoadTestWithMetrics} from "../dev/testhelpers/VRFV2PlusLoadTestWithMetrics.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol"; // for Math.ceilDiv
 
 /*
diff --git a/contracts/test/v0.8/foundry/vrf/VRFV2PlusSubscriptionAPI.t.sol b/contracts/src/v0.8/vrf/test/VRFV2PlusSubscriptionAPI.t.sol
similarity index 98%
rename from contracts/test/v0.8/foundry/vrf/VRFV2PlusSubscriptionAPI.t.sol
rename to contracts/src/v0.8/vrf/test/VRFV2PlusSubscriptionAPI.t.sol
index 763f72f9d92..4fbb44ea717 100644
--- a/contracts/test/v0.8/foundry/vrf/VRFV2PlusSubscriptionAPI.t.sol
+++ b/contracts/src/v0.8/vrf/test/VRFV2PlusSubscriptionAPI.t.sol
@@ -1,11 +1,11 @@
 pragma solidity 0.8.19;
 
-import "../BaseTest.t.sol";
-import {ExposedVRFCoordinatorV2_5} from "../../../../src/v0.8/vrf/dev/testhelpers/ExposedVRFCoordinatorV2_5.sol";
-import {VRFV2PlusLoadTestWithMetrics} from "../../../../src/v0.8/vrf/dev/testhelpers/VRFV2PlusLoadTestWithMetrics.sol";
-import {SubscriptionAPI} from "../../../../src/v0.8/vrf/dev/SubscriptionAPI.sol";
-import {MockLinkToken} from "../../../../src/v0.8/mocks/MockLinkToken.sol";
-import {MockV3Aggregator} from "../../../../src/v0.8/tests/MockV3Aggregator.sol";
+import "./BaseTest.t.sol";
+import {ExposedVRFCoordinatorV2_5} from "../dev/testhelpers/ExposedVRFCoordinatorV2_5.sol";
+import {VRFV2PlusLoadTestWithMetrics} from "../dev/testhelpers/VRFV2PlusLoadTestWithMetrics.sol";
+import {SubscriptionAPI} from "../dev/SubscriptionAPI.sol";
+import {MockLinkToken} from "../../mocks/MockLinkToken.sol";
+import {MockV3Aggregator} from "../../tests/MockV3Aggregator.sol";
 import "@openzeppelin/contracts/utils/Strings.sol"; // for Strings.toString
 import {VmSafe} from "forge-std/Vm.sol";
 
diff --git a/contracts/test/v0.8/foundry/vrf/VRFV2PlusWrapper.t.sol b/contracts/src/v0.8/vrf/test/VRFV2PlusWrapper.t.sol
similarity index 95%
rename from contracts/test/v0.8/foundry/vrf/VRFV2PlusWrapper.t.sol
rename to contracts/src/v0.8/vrf/test/VRFV2PlusWrapper.t.sol
index d9da49c2ca4..e40172717b2 100644
--- a/contracts/test/v0.8/foundry/vrf/VRFV2PlusWrapper.t.sol
+++ b/contracts/src/v0.8/vrf/test/VRFV2PlusWrapper.t.sol
@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {BaseTest} from "../BaseTest.t.sol";
-import {MockLinkToken} from "../../../../src/v0.8/mocks/MockLinkToken.sol";
-import {MockV3Aggregator} from "../../../../src/v0.8/tests/MockV3Aggregator.sol";
-import {ExposedVRFCoordinatorV2_5} from "../../../../src/v0.8/vrf/dev/testhelpers/ExposedVRFCoordinatorV2_5.sol";
-import {SubscriptionAPI} from "../../../../src/v0.8/vrf/dev/SubscriptionAPI.sol";
-import {VRFV2PlusWrapperConsumerExample} from "../../../../src/v0.8/vrf/dev/testhelpers/VRFV2PlusWrapperConsumerExample.sol";
-import {VRFCoordinatorV2_5} from "../../../../src/v0.8/vrf/dev/VRFCoordinatorV2_5.sol";
-import {VRFConsumerBaseV2Plus} from "../../../../src/v0.8/vrf/dev/VRFConsumerBaseV2Plus.sol";
-import {VRFV2PlusWrapper} from "../../../../src/v0.8/vrf/dev/VRFV2PlusWrapper.sol";
-import {VRFV2PlusClient} from "../../../../src/v0.8/vrf/dev/libraries/VRFV2PlusClient.sol";
+import {BaseTest} from "./BaseTest.t.sol";
+import {MockLinkToken} from "../../mocks/MockLinkToken.sol";
+import {MockV3Aggregator} from "../../tests/MockV3Aggregator.sol";
+import {ExposedVRFCoordinatorV2_5} from "../dev/testhelpers/ExposedVRFCoordinatorV2_5.sol";
+import {SubscriptionAPI} from "../dev/SubscriptionAPI.sol";
+import {VRFV2PlusWrapperConsumerExample} from "../dev/testhelpers/VRFV2PlusWrapperConsumerExample.sol";
+import {VRFCoordinatorV2_5} from "../dev/VRFCoordinatorV2_5.sol";
+import {VRFConsumerBaseV2Plus} from "../dev/VRFConsumerBaseV2Plus.sol";
+import {VRFV2PlusWrapper} from "../dev/VRFV2PlusWrapper.sol";
+import {VRFV2PlusClient} from "../dev/libraries/VRFV2PlusClient.sol";
 
 contract VRFV2PlusWrapperTest is BaseTest {
   address internal constant LINK_WHALE = 0xD883a6A1C22fC4AbFE938a5aDF9B2Cc31b1BF18B;
diff --git a/contracts/test/v0.8/foundry/vrf/VRFV2PlusWrapper_Migration.t.sol b/contracts/src/v0.8/vrf/test/VRFV2PlusWrapper_Migration.t.sol
similarity index 95%
rename from contracts/test/v0.8/foundry/vrf/VRFV2PlusWrapper_Migration.t.sol
rename to contracts/src/v0.8/vrf/test/VRFV2PlusWrapper_Migration.t.sol
index f7ca37fdcee..deaef4ba84e 100644
--- a/contracts/test/v0.8/foundry/vrf/VRFV2PlusWrapper_Migration.t.sol
+++ b/contracts/src/v0.8/vrf/test/VRFV2PlusWrapper_Migration.t.sol
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {BaseTest} from "../BaseTest.t.sol";
-import {MockLinkToken} from "../../../../src/v0.8/mocks/MockLinkToken.sol";
-import {MockV3Aggregator} from "../../../../src/v0.8/tests/MockV3Aggregator.sol";
-import {ExposedVRFCoordinatorV2_5} from "../../../../src/v0.8/vrf/dev/testhelpers/ExposedVRFCoordinatorV2_5.sol";
-import {VRFCoordinatorV2Plus_V2Example} from "../../../../src/v0.8/vrf/dev/testhelpers/VRFCoordinatorV2Plus_V2Example.sol";
-import {VRFV2PlusWrapperConsumerExample} from "../../../../src/v0.8/vrf/dev/testhelpers/VRFV2PlusWrapperConsumerExample.sol";
-import {SubscriptionAPI} from "../../../../src/v0.8/vrf/dev/SubscriptionAPI.sol";
-import {VRFV2PlusWrapper} from "../../../../src/v0.8/vrf/dev/VRFV2PlusWrapper.sol";
+import {BaseTest} from "./BaseTest.t.sol";
+import {MockLinkToken} from "../../mocks/MockLinkToken.sol";
+import {MockV3Aggregator} from "../../tests/MockV3Aggregator.sol";
+import {ExposedVRFCoordinatorV2_5} from "../dev/testhelpers/ExposedVRFCoordinatorV2_5.sol";
+import {VRFCoordinatorV2Plus_V2Example} from "../dev/testhelpers/VRFCoordinatorV2Plus_V2Example.sol";
+import {VRFV2PlusWrapperConsumerExample} from "../dev/testhelpers/VRFV2PlusWrapperConsumerExample.sol";
+import {SubscriptionAPI} from "../dev/SubscriptionAPI.sol";
+import {VRFV2PlusWrapper} from "../dev/VRFV2PlusWrapper.sol";
 
 contract VRFV2PlusWrapper_MigrationTest is BaseTest {
   address internal constant LINK_WHALE = 0xD883a6A1C22fC4AbFE938a5aDF9B2Cc31b1BF18B;