diff --git a/tezt/lib_tezos/agnostic_baker.ml b/tezt/lib_tezos/agnostic_baker.ml
index ab428681a9bc679bee014d0845d1e0be14d579ab..f9833b4bd431e6290468b33fd5ed68533188df0b 100644
--- a/tezt/lib_tezos/agnostic_baker.ml
+++ b/tezt/lib_tezos/agnostic_baker.ml
@@ -145,6 +145,9 @@ let create ?runner ?path ?name ?color ?event_pipe ?(delegates = []) ?votefile
     ?dal_node_timeout_percentage ?(state_recorder = false)
     ?(node_version_check_bypass = false) ?node_version_allowed ?keep_alive
     ?allow_fixed_random_seed ?allow_signing_delay node client =
+  let node_rpc_endpoint =
+    Node.as_rpc_endpoint ~local:(Node.runner node = runner) node
+  in
   let agnostic_baker =
     create_from_uris
       ?runner
@@ -165,7 +168,7 @@ let create ?runner ?path ?name ?color ?event_pipe ?(delegates = []) ?votefile
       ?node_version_allowed
       ~base_dir:(Client.base_dir client)
       ~node_data_dir:(Node.data_dir node)
-      ~node_rpc_endpoint:(Node.as_rpc_endpoint node)
+      ~node_rpc_endpoint
       ?keep_alive
       ?allow_fixed_random_seed
       ?allow_signing_delay
diff --git a/tezt/lib_tezos/dal_node.ml b/tezt/lib_tezos/dal_node.ml
index 58b3971bceee24decea3b872f1d43ff6e5bec1e5..78843333dc35702eccde22f63ae9527981587fe3 100644
--- a/tezt/lib_tezos/dal_node.ml
+++ b/tezt/lib_tezos/dal_node.ml
@@ -379,6 +379,9 @@ let create ?runner ?path ?name ?color ?data_dir ?event_pipe
     ?(rpc_host = Constant.default_host) ?rpc_port ?listen_addr ?public_addr
     ?metrics_addr ?disable_shard_validation ?disable_amplification ?ignore_pkhs
     ~node () =
+  let l1_node_endpoint =
+    Node.as_rpc_endpoint ~local:(Node.runner node = runner) node
+  in
   create_from_endpoint
     ?runner
     ?path
@@ -394,7 +397,7 @@ let create ?runner ?path ?name ?color ?data_dir ?event_pipe
     ?disable_shard_validation
     ?disable_amplification
     ?ignore_pkhs
-    ~l1_node_endpoint:(Node.as_rpc_endpoint node)
+    ~l1_node_endpoint
     ()
 
 let make_arguments node =