diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 9cec140f81792f53c6494d878065f38fbd82e53a..6fea734c3d3f8018b3048d080bb080f72d190228 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -942,10 +942,19 @@ do_node() {
     return ${PIPESTATUS[0]}
 }
 
+single_local_node () {
+   [ "$1" = "$HOSTNAME" ]
+}
+
 do_nodes() {
     local rnodes=$1
     shift
 
+    if $(single_local_node $rnodes); then 
+        do_node $rnodes $@
+        return $?
+    fi
+
     # This is part from do_node
     local myPDSH=$PDSH