diff --git a/ChangeLog b/ChangeLog
index 4f747b3d5c..cb5b11daec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 12 17:08:08 +0100 2008 Jim Meyering <meyering@redhat.com>
+
+	avoid a spurious test failure on non-numa systems
+	* tests/daemon-conf: Ignore a spurious libnuma warning.
+	Reported by Daniel Veillard.
+
 Fri Dec 12 14:57:17 CET 2008 Daniel Veillard <veillard@redhat.com>
 
 	* Makefile.maint: fix tabs in C source error message based on
diff --git a/tests/daemon-conf b/tests/daemon-conf
index 03189d5b87..65a965500f 100755
--- a/tests/daemon-conf
+++ b/tests/daemon-conf
@@ -56,8 +56,11 @@ while :; do
 
   test $i = $n && break
 
-  # Filter out this diagnostic.
-  sed '/^Cannot set group when not running as root$/d' err > k && mv k err
+  # Filter out some ignorable diagnostics.
+  sed \
+      -e '/^Cannot set group when not running as root$/d' \
+      -e '/^libnuma: Warning: .sys not mounted or no numa system/d' \
+    err > k && mv k err
 
   printf '%s\n\n' "remoteReadConfigFile: $f: $param_name: $msg" > expected-err
   diff -u expected-err err || fail=1