diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 16c6c3bc78223d812d99a9b8b06efccfcfe3f6b4..4e0443ccfb6e3f386324e0521ceea3eae3b9c819 100644
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -1,4 +1,4 @@
-FSNAME=lustre
+FSNAME=${FSNAME:-lustre}
 
 # facet hosts
 mds_HOST=${mds_HOST:-`hostname`}
diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 8626370d37a89f85ea65b9f7a0733000e6432629..fc8444160c583a5df2e04f8fcb9193cdb9fe9d52 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -762,12 +762,12 @@ test_21c() {
 	stop_ost
 	stop_ost2
 	stop_mds
+        #reformat to remove ost2 from logs
+        reformat
 }
 run_test 21c "start mds between two osts, stop mds last"
 
 test_22() {
-        #reformat to remove all logs
-        reformat
 	start_mds
 	echo Client mount before any osts are in the logs
 	mount_client $MOUNT