diff --git a/scripts/apply_patch.sh b/scripts/apply_patch.sh
index e537d5350..d3b18d352 100755
--- a/scripts/apply_patch.sh
+++ b/scripts/apply_patch.sh
@@ -18,7 +18,7 @@ set -e
 
 case "$branch" in
     zeronet)
-        sed -i s/TEZOS/TEZOS_ZERONET/ ./lib_node_shell/distributed_db_message.ml
+        sed -i s/TEZOS/TEZOS_ZERONET/ ./src/lib_node_shell/distributed_db_message.ml
         patch -p1 < scripts/alphanet_constants.patch
         patch -p1 < scripts/zeronet.patch
         cp README.md docs/README.master
@@ -27,7 +27,7 @@ case "$branch" in
         echo "Done"
         ;;
     alphanet)
-        sed -i s/TEZOS/TEZOS_ALPHANET/ ./lib_node_shell/distributed_db_message.ml
+        sed -i s/TEZOS/TEZOS_ALPHANET/ ./src/lib_node_shell/distributed_db_message.ml
         patch -p1 < scripts/alphanet_constants.patch
         cp README.md docs/README.master
         cp docs/README.alphanet README.md
diff --git a/src/bin_client/tezos-init-sandboxed-client.sh b/src/bin_client/tezos-init-sandboxed-client.sh
index 233b43ea0..36c583f7c 100755
--- a/src/bin_client/tezos-init-sandboxed-client.sh
+++ b/src/bin_client/tezos-init-sandboxed-client.sh
@@ -224,7 +224,7 @@ main () {
 
     local bin_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
     if [ $(basename "$bin_dir") = "bin_client" ]; then
-      local_client="${local_client:-$bin_dir/../_build/default/bin_client/main.exe}"
+      local_client="${local_client:-$bin_dir/../../_build/default/src/bin_client/main.exe}"
     fi
 
     if [ $# -lt 1 ] || [ "$1" -le 0 ] || [ 10 -le "$1" ]; then
diff --git a/src/bin_node/tezos-sandboxed-node.sh b/src/bin_node/tezos-sandboxed-node.sh
index b352864e9..65329f86d 100755
--- a/src/bin_node/tezos-sandboxed-node.sh
+++ b/src/bin_node/tezos-sandboxed-node.sh
@@ -51,8 +51,8 @@ main() {
 
     local bin_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
     if [ $(basename "$bin_dir") = "bin_node" ]; then
-        local_node="${local_node:-$bin_dir/../_build/default/bin_node/main.exe}"
-        sandbox_file="${sandbox_file:-$bin_dir/../scripts/sandbox.json}"
+        local_node="${local_node:-$bin_dir/../../_build/default/src/bin_node/main.exe}"
+        sandbox_file="${sandbox_file:-$bin_dir/../../scripts/sandbox.json}"
     fi
 
     if [ $# -lt 1 ] || [ "$1" -le 0 ] || [ 10 -le "$1" ]; then
diff --git a/test/lib/test_lib.inc.sh b/test/lib/test_lib.inc.sh
index 60568de56..b1549dc54 100755
--- a/test/lib/test_lib.inc.sh
+++ b/test/lib/test_lib.inc.sh
@@ -7,10 +7,10 @@ cd "$test_dir"
 
 sandbox_file="$test_dir/sandbox.json"
 
-tezos_sandboxed_node="${1:-$test_dir/../bin_node/tezos-sandboxed-node.sh}"
-local_node="${2:-$test_dir/../_build/default/bin_node/main.exe}"
-tezos_init_sandboxed_client="${3:-$test_dir/../bin_client/tezos-init-sandboxed-client.sh}"
-local_client="${4:-$test_dir/../_build/default/bin_client/main.exe}"
+tezos_sandboxed_node="${1:-$test_dir/../src/bin_node/tezos-sandboxed-node.sh}"
+local_node="${2:-$test_dir/../_build/default/src/bin_node/main.exe}"
+tezos_init_sandboxed_client="${3:-$test_dir/../src/bin_client/tezos-init-sandboxed-client.sh}"
+local_client="${4:-$test_dir/../_build/default/src/bin_client/main.exe}"
 
 source $tezos_sandboxed_node
 source $tezos_init_sandboxed_client