diff --git a/zebra-grpc/src/tests/vectors.rs b/zebra-grpc/src/tests/vectors.rs
index 5d35eb49ce7..9e507c119d7 100644
--- a/zebra-grpc/src/tests/vectors.rs
+++ b/zebra-grpc/src/tests/vectors.rs
@@ -232,7 +232,9 @@ async fn start_server_and_get_client() -> (
     MockService<ScanRequest, ScanResponse, PanicAssertion>,
 ) {
     // get a mocked scan service
-    let mock_scan_service = MockService::build().for_unit_tests();
+    let mock_scan_service = MockService::build()
+        .with_max_request_delay(Duration::from_secs(2))
+        .for_unit_tests();
 
     // start the gRPC server
     let listen_addr: std::net::SocketAddr = "127.0.0.1:0"
@@ -246,8 +248,12 @@ async fn start_server_and_get_client() -> (
     // wait for the server to start
     sleep(Duration::from_secs(1));
 
+    let endpoint = tonic::transport::channel::Endpoint::new(format!("http://{listen_addr}"))
+        .unwrap()
+        .timeout(Duration::from_secs(2));
+
     // connect to the gRPC server
-    let client = ScannerClient::connect(format!("http://{listen_addr}"))
+    let client = ScannerClient::connect(endpoint)
         .await
         .expect("server should receive connection");
 
diff --git a/zebra-rpc/src/indexer/tests/vectors.rs b/zebra-rpc/src/indexer/tests/vectors.rs
index 2d5f1d8f3ba..6608e0bca5b 100644
--- a/zebra-rpc/src/indexer/tests/vectors.rs
+++ b/zebra-rpc/src/indexer/tests/vectors.rs
@@ -56,7 +56,10 @@ async fn start_server_and_get_client() -> Result<(
         .parse()
         .expect("hard-coded IP and u16 port should parse successfully");
 
-    let mock_read_service = MockService::build().for_unit_tests();
+    let mock_read_service = MockService::build()
+        .with_max_request_delay(Duration::from_secs(2))
+        .for_unit_tests();
+
     let (mock_chain_tip_change, mock_chain_tip_change_sender) = MockChainTip::new();
 
     let (server_task, listen_addr) =
@@ -67,8 +70,12 @@ async fn start_server_and_get_client() -> Result<(
     // wait for the server to start
     tokio::time::sleep(Duration::from_secs(1)).await;
 
+    let endpoint = tonic::transport::channel::Endpoint::new(format!("http://{listen_addr}"))
+        .unwrap()
+        .timeout(Duration::from_secs(2));
+
     // connect to the gRPC server
-    let client = IndexerClient::connect(format!("http://{listen_addr}"))
+    let client = IndexerClient::connect(endpoint)
         .await
         .expect("server should receive connection");