diff --git a/ChangeLog b/ChangeLog
index c000b38d6..4e30a39a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,21 @@
 	* include/grub/script_sh.h (sourcecode): Add const qualifier.
 	* util/grub-script-check.c (getline): Fix empty lines case.
 
+2010-01-28  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* Makefile.in (check): Exit with fail status when one of the tests
+	fails.
+	* tests/example_functional_test.c (example_test): Fix reversed assert.
+	* tests/example_unit_test.c (example_test): Likewise.
+
+2010-01-28  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/10_linux.in: This script does not use any of the
+	contents of gettext.sh, only the external command `gettext', so stop
+	sourcing it.  (Moreover, gettext.sh isn't necessarily installed in
+	the same prefix as GRUB.)
+	* util/grub.d/10_kfreebsd.in: Likewise.
+
 2010-01-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/cmdline.c (grub_cmdline_get): Fix completion in the middle
diff --git a/Makefile.in b/Makefile.in
index d0bbe3b25..aa03002f4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -473,23 +473,21 @@ distcheck: dist
 
 check: all $(UNIT_TESTS) $(FUNCTIONAL_TESTS) $(SCRIPTED_TESTS)
 	@list="$(UNIT_TESTS)"; \
+	set -e; \
 	for file in $$list; do \
 	  $(builddir)/$$file; \
 	done
 	@list="$(FUNCTIONAL_TESTS)"; \
+	set -e; \
 	for file in $$list; do \
 	  mod=`basename $$file .mod`; \
 	  echo "insmod functional_test; insmod $$mod; functional_test" \
 	    | $(builddir)/grub-shell; \
 	done
 	@list="$(SCRIPTED_TESTS)"; \
+	set -e; \
 	for file in $$list; do \
-	  echo "$$file:"; \
-	  if $(builddir)/$$file; then \
-	    echo "$$file: PASS"; \
-	  else \
-	    echo "$$file: FAIL"; \
-	  fi; \
+	  $(builddir)/$$file; \
 	done
 
 .SUFFIX:
diff --git a/tests/example_functional_test.c b/tests/example_functional_test.c
index f43c0f1ce..6802d2d53 100644
--- a/tests/example_functional_test.c
+++ b/tests/example_functional_test.c
@@ -28,7 +28,7 @@ example_test (void)
 
   /* Check if 1st argument is true and report with custom error message.  */
   grub_test_assert (2 == 2, "2 equal 2 expected");
-  grub_test_assert (2 == 3, "2 is not equal to %d", 3);
+  grub_test_assert (2 != 3, "2 matches %d", 3);
 }
 
 /* Register example_test method as a functional test.  */
diff --git a/tests/example_unit_test.c b/tests/example_unit_test.c
index 4999f1412..d721a9d0a 100644
--- a/tests/example_unit_test.c
+++ b/tests/example_unit_test.c
@@ -31,7 +31,7 @@ example_test (void)
 
   /* Check if 1st argument is true and report with custom error message.  */
   grub_test_assert (2 == 2, "2 equal 2 expected");
-  grub_test_assert (2 == 3, "2 is not equal to %d", 3);
+  grub_test_assert (2 != 3, "2 matches %d", 3);
 }
 
 /* Register example_test method as a unit test.  */
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index b84b90a33..62d2fe321 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -22,7 +22,6 @@ bindir=@bindir@
 libdir=@libdir@
 . ${libdir}/grub/grub-mkconfig_lib
 
-. ${bindir}/gettext.sh
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR=@localedir@
 
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 90a6e83e7..b1c75a25b 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -22,7 +22,6 @@ bindir=@bindir@
 libdir=@libdir@
 . ${libdir}/grub/grub-mkconfig_lib
 
-. ${bindir}/gettext.sh
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR=@localedir@