diff --git a/crates/e2e/src/setup/colocation.rs b/crates/e2e/src/setup/colocation.rs
index 845f1b4eb9..3062f770fa 100644
--- a/crates/e2e/src/setup/colocation.rs
+++ b/crates/e2e/src/setup/colocation.rs
@@ -1,6 +1,6 @@
 use {
     crate::{nodes::NODE_HOST, setup::*},
-    ethcontract::{H160, H256},
+    ethcontract::{H160, H256, U256},
     reqwest::Url,
     shared::sources::uniswap_v2::UNISWAP_INIT,
     tokio::task::JoinHandle,
@@ -25,6 +25,19 @@ pub async fn start_naive_solver() -> Url {
     start_solver(config_file, "naive".to_string()).await
 }
 
+pub async fn start_legacy_solver(solver_endpoint: Url, chain_id: Option<U256>) -> Url {
+    let chain_id = chain_id.unwrap_or(U256::from(1));
+    let config_file = config_tmp_file(format!(
+        r#"
+chain-id = "{chain_id}"
+solver-name = "legacy"
+endpoint = "{solver_endpoint}"
+        "#,
+    ));
+
+    start_solver(config_file, "legacy".to_string()).await
+}
+
 async fn start_solver(config_file: TempPath, solver_name: String) -> Url {
     let args = vec![
         "solvers".to_string(),
diff --git a/crates/e2e/src/setup/onchain_components.rs b/crates/e2e/src/setup/onchain_components.rs
index 0918f80130..a52a776aee 100644
--- a/crates/e2e/src/setup/onchain_components.rs
+++ b/crates/e2e/src/setup/onchain_components.rs
@@ -271,6 +271,11 @@ impl OnchainComponents {
 
         let forked_node_api = self.web3.api::<ForkedNodeApi<_>>();
 
+        forked_node_api
+            .set_balance(&auth_manager, to_wei(100))
+            .await
+            .expect("could not set auth_manager balance");
+
         let auth_manager = forked_node_api
             .impersonate(&auth_manager)
             .await
diff --git a/crates/e2e/src/setup/services.rs b/crates/e2e/src/setup/services.rs
index ea9b141c8f..a8892a4f1c 100644
--- a/crates/e2e/src/setup/services.rs
+++ b/crates/e2e/src/setup/services.rs
@@ -1,5 +1,5 @@
 use {
-    super::TestAccount,
+    super::{colocation::start_legacy_solver, TestAccount},
     crate::setup::{
         colocation::{self, SolverEngine},
         wait_for_condition,
@@ -8,7 +8,7 @@ use {
     },
     autopilot::infra::persistence::dto,
     clap::Parser,
-    ethcontract::H256,
+    ethcontract::{H256, U256},
     model::{
         app_data::{AppDataDocument, AppDataHash},
         order::{Order, OrderCreation, OrderUid},
@@ -16,7 +16,7 @@ use {
         solver_competition::SolverCompetitionAPI,
         trade::Trade,
     },
-    reqwest::{Client, StatusCode},
+    reqwest::{Client, StatusCode, Url},
     sqlx::Connection,
     std::time::Duration,
 };
@@ -85,13 +85,19 @@ impl<'a> Services<'a> {
     }
 
     /// Start the autopilot service in a background task.
-    pub fn start_autopilot(&self, extra_args: Vec<String>) {
+    /// Optionally specify a solve deadline to use instead of the default 2s.
+    /// (note: specifying a larger solve deadline will impact test times as the
+    /// driver delays the submission of the solution until shortly before the
+    /// deadline in case the solution would start to revert at some point)
+    pub fn start_autopilot(&self, solve_deadline: Option<Duration>, extra_args: Vec<String>) {
+        let solve_deadline = solve_deadline.unwrap_or(Duration::from_secs(2));
+
         let args = [
             "autopilot".to_string(),
             "--auction-update-interval=1s".to_string(),
             format!("--ethflow-contract={:?}", self.contracts.ethflow.address()),
             "--skip-event-sync=true".to_string(),
-            "--solve-deadline=2s".to_string(),
+            format!("--solve-deadline={solve_deadline:?}"),
         ]
         .into_iter()
         .chain(self.api_autopilot_solver_arguments())
@@ -140,15 +146,60 @@ impl<'a> Services<'a> {
                 endpoint: solver_endpoint,
             }],
         );
-        self.start_autopilot(vec![
-            "--drivers=test_solver|http://localhost:11088/test_solver".to_string(),
-        ]);
+        self.start_autopilot(
+            None,
+            vec!["--drivers=test_solver|http://localhost:11088/test_solver".to_string()],
+        );
         self.start_api(vec![
             "--price-estimation-drivers=test_solver|http://localhost:11088/test_solver".to_string(),
         ])
         .await;
     }
 
+    /// Starts a basic version of the protocol with a single legacy solver and
+    /// quoter.
+    pub async fn start_protocol_legacy_solver(
+        &self,
+        solver: TestAccount,
+        solver_endpoint: Option<Url>,
+        quoter_endpoint: Option<Url>,
+        chain_id: Option<U256>,
+    ) {
+        let external_solver_endpoint =
+            solver_endpoint.unwrap_or("http://localhost:8000/solve".parse().unwrap());
+        let colocated_solver_endpoint =
+            start_legacy_solver(external_solver_endpoint, chain_id).await;
+
+        let external_quoter_endpoint =
+            quoter_endpoint.unwrap_or("http://localhost:8000/quote".parse().unwrap());
+        let colocated_quoter_endpoint =
+            start_legacy_solver(external_quoter_endpoint, chain_id).await;
+
+        colocation::start_driver(
+            self.contracts,
+            vec![
+                SolverEngine {
+                    name: "test_solver".into(),
+                    account: solver.clone(),
+                    endpoint: colocated_solver_endpoint,
+                },
+                SolverEngine {
+                    name: "test_quoter".into(),
+                    account: solver,
+                    endpoint: colocated_quoter_endpoint,
+                },
+            ],
+        );
+        self.start_autopilot(
+            Some(Duration::from_secs(11)),
+            vec!["--drivers=test_solver|http://localhost:11088/test_solver".to_string()],
+        );
+        self.start_api(vec![
+            "--price-estimation-drivers=test_quoter|http://localhost:11088/test_quoter".to_string(),
+        ])
+        .await;
+    }
+
     async fn wait_for_api_to_come_up() {
         let is_up = || async {
             reqwest::get(format!("{API_HOST}{VERSION_ENDPOINT}"))
diff --git a/crates/e2e/tests/e2e/buffers.rs b/crates/e2e/tests/e2e/buffers.rs
index 045272c4f6..41cd403f95 100644
--- a/crates/e2e/tests/e2e/buffers.rs
+++ b/crates/e2e/tests/e2e/buffers.rs
@@ -54,15 +54,18 @@ async fn onchain_settlement_without_liquidity(web3: Web3) {
         }],
     );
     let services = Services::new(onchain.contracts()).await;
-    services.start_autopilot(vec![
-        format!(
-            "--trusted-tokens={weth:#x},{token_a:#x},{token_b:#x}",
-            weth = onchain.contracts().weth.address(),
-            token_a = token_a.address(),
-            token_b = token_b.address()
-        ),
-        "--drivers=test_solver|http://localhost:11088/test_solver".to_string(),
-    ]);
+    services.start_autopilot(
+        None,
+        vec![
+            format!(
+                "--trusted-tokens={weth:#x},{token_a:#x},{token_b:#x}",
+                weth = onchain.contracts().weth.address(),
+                token_a = token_a.address(),
+                token_b = token_b.address()
+            ),
+            "--drivers=test_solver|http://localhost:11088/test_solver".to_string(),
+        ],
+    );
     services.start_api(vec![]).await;
 
     // Place Order
diff --git a/crates/e2e/tests/e2e/onchain_settlement.rs b/crates/e2e/tests/e2e/onchain_settlement.rs
index d4ae524a8c..824391d1cd 100644
--- a/crates/e2e/tests/e2e/onchain_settlement.rs
+++ b/crates/e2e/tests/e2e/onchain_settlement.rs
@@ -132,9 +132,10 @@ async fn onchain_settlement(web3: Web3) {
 
     // Only start the autopilot now to ensure that these orders are settled in a
     // batch which seems to be expected in this test.
-    services.start_autopilot(vec![
-        "--drivers=test_solver|http://localhost:11088/test_solver".to_string(),
-    ]);
+    services.start_autopilot(
+        None,
+        vec!["--drivers=test_solver|http://localhost:11088/test_solver".to_string()],
+    );
 
     let balance = token_b.balance_of(trader_a.address()).call().await.unwrap();
     assert_eq!(balance, 0.into());
diff --git a/crates/e2e/tests/e2e/order_cancellation.rs b/crates/e2e/tests/e2e/order_cancellation.rs
index d384e7e4ce..b74e4a1956 100644
--- a/crates/e2e/tests/e2e/order_cancellation.rs
+++ b/crates/e2e/tests/e2e/order_cancellation.rs
@@ -46,7 +46,7 @@ async fn order_cancellation(web3: Web3) {
     );
 
     let services = Services::new(onchain.contracts()).await;
-    services.start_autopilot(vec![]);
+    services.start_autopilot(None, vec![]);
     services.start_api(vec![]).await;
 
     let place_order = |salt: u8| {
diff --git a/crates/e2e/tests/e2e/protocol_fee.rs b/crates/e2e/tests/e2e/protocol_fee.rs
index a1bb5550c9..14b8da57be 100644
--- a/crates/e2e/tests/e2e/protocol_fee.rs
+++ b/crates/e2e/tests/e2e/protocol_fee.rs
@@ -288,11 +288,14 @@ async fn execute_test(
             endpoint: solver_endpoint,
         }],
     );
-    services.start_autopilot(vec![
-        "--drivers=test_solver|http://localhost:11088/test_solver".to_string(),
-        "--fee-policy-skip-market-orders=false".to_string(),
-        fee_policy.to_string(),
-    ]);
+    services.start_autopilot(
+        None,
+        vec![
+            "--drivers=test_solver|http://localhost:11088/test_solver".to_string(),
+            "--fee-policy-skip-market-orders=false".to_string(),
+            fee_policy.to_string(),
+        ],
+    );
     services
         .start_api(vec![
             "--price-estimation-drivers=test_solver|http://localhost:11088/test_solver".to_string(),
diff --git a/crates/e2e/tests/e2e/refunder.rs b/crates/e2e/tests/e2e/refunder.rs
index a53cc313b0..ca30449259 100644
--- a/crates/e2e/tests/e2e/refunder.rs
+++ b/crates/e2e/tests/e2e/refunder.rs
@@ -25,7 +25,7 @@ async fn refunder_tx(web3: Web3) {
         .await;
 
     let services = Services::new(onchain.contracts()).await;
-    services.start_autopilot(vec![]);
+    services.start_autopilot(None, vec![]);
     services.start_api(vec![]).await;
 
     // Get quote id for order placement
diff --git a/crates/e2e/tests/e2e/solver_competition.rs b/crates/e2e/tests/e2e/solver_competition.rs
index 77b81633e7..b205c6ef67 100644
--- a/crates/e2e/tests/e2e/solver_competition.rs
+++ b/crates/e2e/tests/e2e/solver_competition.rs
@@ -58,10 +58,13 @@ async fn solver_competition(web3: Web3) {
     );
 
     let services = Services::new(onchain.contracts()).await;
-    services.start_autopilot(vec![
+    services.start_autopilot(
+        None,
+        vec![
         "--drivers=solver1|http://localhost:11088/solver1,solver2|http://localhost:11088/solver2"
             .to_string(),
-    ]);
+    ],
+    );
     services.start_api(vec![]).await;
 
     // Place Order