diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index fda47a4ca7487873fb0965ec168cbf6b01516e43..bf500c5bac9b3ef47d2082c62a513cbebe410610 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1209,7 +1209,7 @@ test_32a() {
 	start mds $tmpdir/mds "-o loop,exclude=lustre-OST0000" || return 12
 	cleanup_nocli
 
-	[ -d $tmpdir ] && rm -rf $tmpdir
+	rm -rf $tmpdir || true	# true is only for TMP on NFS
 }
 run_test 32a "Upgrade from 1.4 (not live)"
 
@@ -1267,7 +1267,7 @@ test_32b() {
 	echo "ok."
 
 	cleanup
-	[ -d $tmpdir ] && rm -rf $tmpdir
+	rm -rf $tmpdir || true  # true is only for TMP on NFS
 }
 run_test 32b "Upgrade from 1.4 with writeconf"