diff --git a/b2/test/Common b/b2/test/Common
index 2843f74..de6ecc0 100755
--- a/b2/test/Common
+++ b/b2/test/Common
@@ -13,10 +13,10 @@
 
 run_boom()
 {
-	args="-N file-h <(sed -n '/^!-/q;p' _in)"
+	args="-N h <(sed -n '/^!-/q;p' _in)"
 	for n in c i x p s b X; do
 		if grep ^!-$n _in >/dev/null; then
-			args="$args -N file-$n"
+			args="$args -N $n"
 			args="$args -$n <(sed -n '1,/^!-$n/d;/^!-/q;p' _in)"
 		fi
 	done
diff --git a/b2/test/hierfld b/b2/test/hierfld
index cd0c672..3de01f8 100755
--- a/b2/test/hierfld
+++ b/b2/test/hierfld
@@ -36,7 +36,7 @@ tst_fail "hierarchy: name set field (incorrect name)" <<EOF
 EOF
 
 expect <<EOF
-file-h:2: unknown name set "def"
+h:2: unknown name set "def"
 EOF
 
 #------------------------------------------------------------------------------
@@ -56,7 +56,7 @@ tst_fail "hierarchy: absolute value field (omit type name)" <<EOF
 EOF
 
 expect <<EOF
-file-h:1: syntax error
+h:1: syntax error
 EOF
 
 #------------------------------------------------------------------------------
@@ -76,7 +76,7 @@ tst_fail "hierarchy: relative value field (incorrect name)" <<EOF
 EOF
 
 expect <<EOF
-file-h:1: unknown field "Z"
+h:1: unknown field "Z"
 EOF
 
 ###############################################################################