diff --git a/tools/test/bin/onos-service b/tools/test/bin/onos-service
index 2e7c36e..cc69491 100755
--- a/tools/test/bin/onos-service
+++ b/tools/test/bin/onos-service
@@ -5,6 +5,7 @@
 
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
+. $ONOS_ROOT/tools/test/bin/find-node.sh
 
 function print_usage {
     command_name=`basename $0`
@@ -38,7 +39,7 @@
         if [ "${1}" = "--cell" ]; then
             nodes=$(env | sort | egrep "OC[0-9]+" | cut -d= -f2)
         else
-            nodes=${1:-$OCI}
+            nodes=$(find_node ${1:-$OCI})
         fi
 
         # Execute the remote commands
diff --git a/tools/test/bin/onos-wait-for-start b/tools/test/bin/onos-wait-for-start
index ffaa402..e643b5a 100755
--- a/tools/test/bin/onos-wait-for-start
+++ b/tools/test/bin/onos-wait-for-start
@@ -5,8 +5,11 @@
 
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
+. $ONOS_ROOT/tools/test/bin/find-node.sh
 
-remote=$ONOS_USER@${1:-$OCI}
+node=$(find_node ${1:-$OCI})
+
+remote=$ONOS_USER@$node
 
 ssh -t $remote "
     # Wait until we reach the run-level 100