diff --git a/src/bin_client/tezos-init-sandboxed-client.sh b/src/bin_client/tezos-init-sandboxed-client.sh
index 36c583f7c..9816a2875 100755
--- a/src/bin_client/tezos-init-sandboxed-client.sh
+++ b/src/bin_client/tezos-init-sandboxed-client.sh
@@ -224,7 +224,9 @@ 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/src/bin_client/main.exe}"
+        local_client="${local_client:-$bin_dir/../../_build/default/src/bin_client/main.exe}"
+    else
+        local_client="${local_client:-tezos-client}"
     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 65329f86d..b14bd5c0e 100755
--- a/src/bin_node/tezos-sandboxed-node.sh
+++ b/src/bin_node/tezos-sandboxed-node.sh
@@ -22,10 +22,25 @@ start_sandboxed_node() {
         peers+=("127.0.0.1:$peer_port")
     done
     peers+=("--closed")
-    node="${local_node:-tezos-node}"
-    sandbox_file="${sandbox_file:-$script_dir/sandbox.json}"
+    node="${local_node}"
     sandbox_param="--sandbox=$sandbox_file"
 
+    if ! [ -f "$sandbox_file" ]; then
+        cat > "$sandbox_file" <<EOF
+{
+    "genesis_pubkey":
+      "edpkuSLWfVU1Vq7Jg9FucPyKmma6otcMHac9zG4oU1KMHSTBpJuGQ2",
+    "bootstrap_keys": [
+        "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav",
+        "edpktzNbDAUjUk697W7gYg2CRuBQjyPxbEg8dLccYYwKSKvkPvjtV9",
+        "edpkuTXkJDGcFd5nh6VvMz8phXxU3Bi7h6hqgywNFi1vZTfQNnS1RV",
+        "edpkuFrRoDSEbJYgxRtLx2ps82UdaYc1WwfS9sE11yhauZt5DgCHbU",
+        "edpkv8EUUH68jmo3f7Um5PezmfGrRF24gnfLpH3sVNwJnV5bVCxL2n"
+    ]
+}
+EOF
+    fi
+
     node_dirs+=("$node_dir")
 
     $node config init \
@@ -53,6 +68,9 @@ main() {
     if [ $(basename "$bin_dir") = "bin_node" ]; then
         local_node="${local_node:-$bin_dir/../../_build/default/src/bin_node/main.exe}"
         sandbox_file="${sandbox_file:-$bin_dir/../../scripts/sandbox.json}"
+    else
+        local_node="${local_node:-tezos-node}"
+        sandbox_file="${sandbox_file:-sandbox.json}"
     fi
 
     if [ $# -lt 1 ] || [ "$1" -le 0 ] || [ 10 -le "$1" ]; then