diff --git a/tests/mv/setup b/tests/mv/setup
index 41a76c155..5d1587efb 100755
--- a/tests/mv/setup
+++ b/tests/mv/setup
@@ -29,13 +29,15 @@ for d in $CANDIDATE_TMP_DIRS; do
 
 done
 
-if test -z $other_partition_tmpdir; then
+if test -z "$other_partition_tmpdir"; then
   cat <<EOF 1>&2
+**************************************
 This test requires a writable directory on a different disk partition,
 and I couldn\'t find one.  I tried these defaults:
   $CANDIDATE_TMP_DIRS
 Set your environment variable CANDIDATE_TMP_DIRS to make this test
 use a different list.
+**************************************
 EOF
 fi