diff --git a/test/test-lib.el b/test/test-lib.el
index 79a9d4d6..236dd99e 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -205,3 +205,8 @@ running, quit if it terminated."
 ;; environments
 
 (setq mm-text-html-renderer 'html2text)
+
+;; Set our own default for message-hidden-headers, to avoid tests
+;; breaking when the Emacs default changes.
+(setq message-hidden-headers
+      '("^References:" "^Face:" "^X-Face:" "^X-Draft-From:"))