diff --git a/ChangeLog b/ChangeLog
index 27e2aee97..79eeae387 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-23  Jordan Uggla  <jordan.uggla@gmail.com>
+
+	* tests/util/grub-shell.in: Suppress "ACPI shutdown failed" error to
+	keep unit tests from failing when they shouldn't.
+
 2010-12-21  Colin Watson  <cjwatson@ubuntu.com>
 
 	* include/grub/offsets.h (GRUB_KERNEL_I386_PC_RAW_SIZE): The
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index fc14ca7b0..e35d6bc65 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -132,6 +132,8 @@ done
 
 cat <<EOF >>${cfgfile}
 source /boot/grub/testcase.cfg
+# Stop serial output to suppress "ACPI shutdown failed" error.
+terminal_output console
 halt
 EOF