diff --git a/tests/test-keyword b/tests/test-keyword
--- a/tests/test-keyword
+++ b/tests/test-keyword
@@ -296,3 +296,13 @@ cat a b
 echo % hg cat
 hg cat sym a b
 echo
+
+echo % hg serve
+hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
+cat hg.pid >> $DAEMON_PIDS
+echo % hgweb changeset
+("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw')
+echo % hgweb filediff
+("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw')
+echo % errors encountered
+cat errors.log
diff --git a/tests/test-keyword.out b/tests/test-keyword.out
--- a/tests/test-keyword.out
+++ b/tests/test-keyword.out
@@ -393,3 +393,39 @@ xxx $
 $Xinfo$
 ignore $Id$
 a
+% hg serve
+% hgweb changeset
+200 Script output follows
+
+
+# HG changeset patch
+# User User Name <user@example.com>
+# Date 3 0
+# Node ID cfa68229c1167443337266ebac453c73b1d5d16e
+# Parent bb948857c743469b22bbf51f7ec8112279ca5d83
+xa
+
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/x/a	Thu Jan 01 00:00:03 1970 +0000
+@@ -0,0 +1,4 @@
++expand $Id$
++do not process $Id:
++xxx $
++$Xinfo$
+
+% hgweb filediff
+200 Script output follows
+
+
+--- a/a	Thu Jan 01 00:00:00 1970 +0000
++++ b/a	Thu Jan 01 00:00:02 1970 +0000
+@@ -1,3 +1,4 @@
+ expand $Id$
+ do not process $Id:
+ xxx $
++$Xinfo$
+
+
+
+
+% errors encountered