diff --git a/bench b/bench
index 9ec09929..9eafbb8e 100755
--- a/bench
+++ b/bench
@@ -167,8 +167,8 @@ FULL_MOUNT_OPTIONS=`_scratch_mount_options`
 
 # $OUT is the report which will ultimately be sent, keep it tidy.
 cat >$OUT <<EOF
-bench: MKFS_OPTIONS  -- $FULL_MKFS_OPTIONS
-bench: MOUNT_OPTIONS --$FULL_MOUNT_OPTIONS
+MKFS_OPTIONS  -- $FULL_MKFS_OPTIONS
+MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS
 
 EOF
 
diff --git a/check b/check
index fd299cdf..84eed6ae 100755
--- a/check
+++ b/check
@@ -151,7 +151,7 @@ timestamp=${TIMESTAMP:=false}
 [ -f check.time ] || touch check.time
 
 FULL_MKFS_OPTIONS=`_scratch_mkfs_options`
-echo check: MKFS_OPTIONS  -- $FULL_MKFS_OPTIONS
+echo "MKFS_OPTIONS  -- $FULL_MKFS_OPTIONS"
 umount $SCRATCH_DEV 2>/dev/null
 # call the overridden mkfs.xfs - make sure the FS is built
 # the same as we'll create it later.
@@ -164,7 +164,7 @@ then
 fi
 
 FULL_MOUNT_OPTIONS=`_scratch_mount_options`
-echo check: MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS
+echo "MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS"
 # call the overridden mount - make sure the FS mounts with
 # the same options that we'll mount with later.
 if ! _scratch_mount >$tmp.err 2>&1
diff --git a/setup b/setup
new file mode 100755
index 00000000..51c941aa
--- /dev/null
+++ b/setup
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+if ! . ./common.config
+then
+    echo "check: failed to source common.config"
+    exit 1
+fi
+
+use="(external=no)"
+[ "$USE_EXTERNAL" = yes ] && use="(external=yes)"
+
+cat <<EOF
+TEST: DIR=$TEST_DIR DEV=$TEST_DEV rt=[$TEST_RTDEV] log=[$TEST_LOGDEV]
+TAPE: dev=[$TAPE_DEV] rmt=[$RMT_TAPE_DEV] rmtirix=[$RMT_TAPE_USER@$RMT_IRIXTAPE_DEV]
+SCRATCH: MNT=$SCRATCH_MNT DEV=$SCRATCH_DEV rt=[$SCRATCH_RTDEV] log=[$SCRATCH_LOGDEV]  $use
+EOF