diff --git a/test/launch.sh b/test/launch.sh
index c8f13b7a8..92f1b9520 100755
--- a/test/launch.sh
+++ b/test/launch.sh
@@ -2,7 +2,7 @@ COMMAND='gnome-terminal'
 COUNT=2
 for i in $(seq 1 $COUNT)
 do
-    SUBCOMMAND="./tezos-node -net-port $((9900 + i)) -net-local-discovery true -rpc-port $((8800 + i)) -net-expected-connections $(($COUNT - 1))  -base-dir /tmp/tezos_$i"
+    SUBCOMMAND="./tezos-node --net-addr :::$((9900 + i)) --local-discovery :::7732 --rpc-addr :::$((8800 + i)) --expected-connections $(($COUNT - 1))  --base-dir /tmp/tezos_$i"
     COMMAND="$COMMAND --tab -e '$SUBCOMMAND'"
 done
 echo $COMMAND
diff --git a/test/test-basic.sh b/test/test-basic.sh
index 835824a0c..5ca301f7b 100755
--- a/test/test-basic.sh
+++ b/test/test-basic.sh
@@ -17,8 +17,8 @@ trap cleanup EXIT QUIT INT
 NODE=../tezos-node
 CLIENT="../tezos-client -base-dir ${CLIENT_DIR}"
 
-CUSTOM_PARAM="-sandbox-param ./sandbox.json "
-${NODE} -sandbox ${DATA_DIR} ${CUSTOM_PARAM} -rpc-port 8732 > LOG 2>&1 &
+CUSTOM_PARAM="--sandbox-param ./sandbox.json"
+${NODE} --sandbox "${DATA_DIR}" ${CUSTOM_PARAM} --rpc-addr :::8732 > LOG 2>&1 &
 NODE_PID="$!"
 
 sleep 3
diff --git a/test/test_basic.ml b/test/test_basic.ml
index d3c80d69e..682f56d88 100644
--- a/test/test_basic.ml
+++ b/test/test_basic.ml
@@ -38,9 +38,9 @@ let fork_node () =
     Unix.create_process
       Filename.(concat (dirname (Sys.getcwd ())) "tezos-node")
       [| "tezos-node" ;
-         "-sandbox"; data_dir ;
-         "-sandbox-param"; "./sandbox.json";
-         "-rpc-port"; "8732" |]
+         "--sandbox"; data_dir ;
+         "--sandbox-param"; "./sandbox.json";
+         "--rpc-addr"; ":::8732" |]
       null_fd log_fd log_fd in
   Printf.printf "Created node, pid: %d, log: %s\n%!" pid log_file_name ;
   at_exit