diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
index 73e70081e9a..4a3935475c5 100644
--- a/contracts/hardhat.config.ts
+++ b/contracts/hardhat.config.ts
@@ -132,6 +132,19 @@ let config = {
         version: '0.8.19',
         settings: COMPILER_SETTINGS,
       },
+      'src/v0.8/workflow/dev/WorkflowRegistry.sol': {
+        version: '0.8.24',
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 1000000, // see native_solc_compile_all_workflow
+          },
+          viaIR: true,
+          metadata: {
+            bytecodeHash: 'none',
+          },
+        },
+      },
     },
   },
   mocha: {
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.activateWorkflow.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.activateWorkflow.t.sol
index 6dca1a4738d..47858774e0d 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.activateWorkflow.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.activateWorkflow.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-import {WorkflowRegistry} from "../../src/WorkflowRegistry.sol";
+import {WorkflowRegistry} from "../../dev/WorkflowRegistry.sol";
 import {WorkflowRegistrySetup} from "./WorkflowRegistrySetup.t.sol";
 
 contract WorkflowRegistry_activateWorkflow is WorkflowRegistrySetup {
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.activateVersion.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.activateVersion.t.sol
index 054c41b79ab..555d26e065f 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.activateVersion.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.activateVersion.t.sol
@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-import {WorkflowRegistryManager} from "../../src/WorkflowRegistryManager.sol";
 import {WorkflowRegistryManagerSetup} from "./WorkflowRegistryManagerSetup.t.sol";
 
-import {Ownable2Step} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwnerWithProposal.sol";
+import {Ownable2Step} from "../../../shared/access/Ownable2Step.sol";
 
 contract WorkflowRegistryManager_activateVersion is WorkflowRegistryManagerSetup {
   function test_RevertWhen_TheCallerIsNotTheOwner() external {
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManagerSetup.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManagerSetup.t.sol
index 8e29364839c..c9e4a84da81 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManagerSetup.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManagerSetup.t.sol
@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-import "@chainlink/contracts/src/v0.8/vendor/forge-std/src/Test.sol";
-
-import {WorkflowRegistryManager} from "../../src/WorkflowRegistryManager.sol";
+import {WorkflowRegistryManager} from "../../dev/WorkflowRegistryManager.sol";
+import {Test} from "forge-std/Test.sol";
 
 contract WorkflowRegistryManagerSetup is Test {
   WorkflowRegistryManager internal s_registryManager;