diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index 8c4c2697dd9a3ce9339b4fb15fe3625de913ea44..6357deeb66cb07a8bcd03a54959b90c27f5f4292 100644
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -606,9 +606,11 @@ cleanup_mount() {
 	[ "$MOUNT_LIST" ] || fail "error: $0: MOUNT_LIST unset"
 
 	for THEMOUNT in $MOUNT_LIST; do
-	    if [ "`mount | grep $THEMOUNT`" ]; then
-		umount $THEMOUNT || fail "unable to unmount $THEMOUNT"
-	    fi
+	    eval "echo \$$THEMOUNT" | while read MTPT THEOSC THEMDC; do
+                if [ "`mount | grep $MTPT`" ]; then
+                    umount $MTPT || fail "unable to unmount $MTPT"
+                fi
+            done
 	done
 }
 
diff --git a/lustre/tests/create.pl b/lustre/tests/create.pl
index 12e28c2de5419587e6bb629810f2e1fc54dababf..f5e6d9b76ddd30865a4d0523ab5376c58dcc980f 100644
--- a/lustre/tests/create.pl
+++ b/lustre/tests/create.pl
@@ -10,7 +10,7 @@ sub usage () {
 my $mtpt = shift || usage();
 my $mount_count = shift || usage();
 my $i = shift || usage();
-my $files = 5;
+my $files = 2;
 
 while ($i--) {
     $which = int(rand() * $mount_count) + 1;