diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 0f58491c72440e087da0b31b8151d3d92e256f21..6d3b3138a2e4bce84f0687e6ff2e06c25b454779 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -77,7 +77,7 @@ mount_client() {
 umount_client() {
 	local MOUNTPATH=$1
 	echo "umount lustre on ${MOUNTPATH}....."
-	zconf_umount $MOUNTPATH $CMDVERBOSE || return 97
+	zconf_umount `hostname`  $MOUNTPATH $CMDVERBOSE || return 97
 }
 
 manual_umount_client(){
diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 18a93eacd07cf4cae64eb0a5dd4b0113c84137fc..8ae8c13c8d2588e00418599d6e4c697eddf67d1c 100755
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -35,11 +35,11 @@ setup() {
     start ost2 --reformat $OSTLCONFARGS 
     [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
     start mds $MDSLCONFARGS --reformat
-    zconf_mount $MOUNT
+    zconf_mount `hostname`  $MOUNT
 }
 
 cleanup() {
-    zconf_umount $MOUNT
+    zconf_umount `hostname` $MOUNT
     stop mds ${FORCE} $MDSLCONFARGS
     stop ost2 ${FORCE} --dump cleanup.log
     stop ost ${FORCE} --dump cleanup.log
diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 9da6729b6973e3fb304c7059022a76ed2d3c5435..f6395a4e689fa7fa8233734fc88064002720e233 100755
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -62,8 +62,8 @@ fi
 start ost2 --reformat $OSTLCONFARGS 
 [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
 start mds $MDSLCONFARGS --reformat
-zconf_mount $MOUNT
-zconf_mount $MOUNT2
+zconf_mount `hostname` $MOUNT
+zconf_mount `hostname` $MOUNT2
 
 echo $TIMEOUT > /proc/sys/lustre/timeout
 echo $UPCALL > /proc/sys/lustre/upcall
diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index d31b34811d44dbd4cc59f7a3346c630556fe6606..1aabb7d64663e5017d15447a62c7d5a96b9ba70a 100755
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -34,7 +34,7 @@ cleanup() {
     if [ $activeost != "ost" ]; then
         fail ost
     fi
-    zconf_umount $MOUNT
+    zconf_umount `hostname` $MOUNT
     stop mds ${FORCE} $MDSLCONFARGS
     stop ost ${FORCE} --dump cleanup.log
 }
@@ -55,7 +55,7 @@ start ost --reformat $OSTLCONFARGS
 
 [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
 start mds --reformat $MDSLCONFARGS
-zconf_mount $MOUNT
+zconf_mount `hostname` $MOUNT
 
 mkdir -p $DIR
 
diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 8fdcb688d7d0c7a1fff9d593e3aa677e5558e56d..b5165879432ba6ae0a3a3d6af336b973e3712885 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -40,7 +40,7 @@ cleanup() {
     if [ $activemds != "mds" ]; then
         fail mds
     fi
-    zconf_umount $MOUNT
+    zconf_umount `hostname` $MOUNT
     stop mds ${FORCE} $MDSLCONFARGS
     stop ost2 ${FORCE} --dump cleanup.log
     stop ost ${FORCE} --dump cleanup.log
@@ -62,7 +62,7 @@ setup() {
     start ost2 --reformat $OSTLCONFARGS 
     [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
     start mds $MDSLCONFARGS --reformat
-    zconf_mount $MOUNT
+    zconf_mount `hostname` $MOUNT
 }
 
 $SETUP