diff --git a/tests/funcs/filter.sh b/tests/funcs/filter.sh
index 795a01de..1016b8ef 100644
--- a/tests/funcs/filter.sh
+++ b/tests/funcs/filter.sh
@@ -87,7 +87,7 @@ awk '
 	( in_block == 2 ) {
 		buf = buf $0 "\n"
 		if ($0 ~ /<\/TASK>/) {
-			if (buf ~ /xfs_nondir_ilock_class/ && buf ~ /fs_reclaim/) {
+			if (buf ~ /xfs_(nondir_|dir_)?ilock_class/ && buf ~ /fs_reclaim/) {
 				# known xfs lockdep false positive, discard
 			} else {
 				printf "%s", buf
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index f6c506ec..56598cbc 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -694,8 +694,8 @@ for t in $tests; do
 		if [ "$sts" == "$T_PASS_STATUS" ]; then
 			dmesg | t_filter_dmesg > "$T_TMPDIR/dmesg.after"
 			diff --old-line-format="" --unchanged-line-format="" \
-				"$T_TMPDIR/dmesg.before" "$T_TMPDIR/dmesg.after" > \
-				"$T_TMPDIR/dmesg.new"
+				"$T_TMPDIR/dmesg.before" "$T_TMPDIR/dmesg.after" | \
+				grep -v '^$' > "$T_TMPDIR/dmesg.new"
 
 			if [ -s "$T_TMPDIR/dmesg.new" ]; then
 				message="unexpected messages in dmesg"