diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 09fbb63ce5ffb4e00baf1971ed80847a18464c57..9d14d74a9cc8692188709cee2ff35f40c74fc4cf 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -65,7 +65,8 @@ setup_if_needed() {
     fi
 
     echo "Lustre is not mounted, trying to do setup SETUP=$SETUP ... "
-    $FORMAT && $SETUP
+    [ "$REFORMAT" ] && $FORMAT
+    $SETUP
 
     MOUNTED=$(mounted_lustre_filesystems)
     if ! $(echo $MOUNTED | grep -w -q $MOUNT); then