diff --git a/ChangeLog b/ChangeLog
index bb263f281..058543705 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* grub-core/tests/lib/test.c (grub_test_run): Return non-zero on
+	test failures, so that a failing unit test correctly causes 'make
+	check' to fail.
+
 2013-01-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	Fix failing printf test.
diff --git a/grub-core/tests/lib/test.c b/grub-core/tests/lib/test.c
index aac77e9fc..1d2cb8c6e 100644
--- a/grub-core/tests/lib/test.c
+++ b/grub-core/tests/lib/test.c
@@ -225,10 +225,14 @@ grub_test_run (grub_test_t test)
 		 failure->line, (failure->message ? : "<no message>"));
 
   if (!failure_list)
-    grub_printf ("%s: PASS\n", test->name);
+    {
+      grub_printf ("%s: PASS\n", test->name);
+      return GRUB_ERR_NONE;
+    }
   else
-    grub_printf ("%s: FAIL\n", test->name);
-
-  free_failures ();
-  return GRUB_ERR_NONE;
+    {
+      grub_printf ("%s: FAIL\n", test->name);
+      free_failures ();
+      return GRUB_ERR_TEST_FAILURE;
+    }
 }