diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 8b98001077d96793dd8fb4f35d541d7f3771a2c3..fc0ba898b7cd98fb360478261a3122bcaf528e8c 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -57,7 +57,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