diff --git a/ChangeLog b/ChangeLog
index 23011288e..40fd400d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/tests/cmdline_cat_test.c (cmdline_cat_test): Ignore errors
+	of loading gfxterm as gfxterm is embed in kernel on some platforms.
+	* grub-core/tests/gfxterm_menu.c (gfxterm_menu): Likewise.
+	Load gfxmenu.
+
 2013-11-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* tests/core_compress_test.in: Use full arguments as grub-mkimage-extra
diff --git a/grub-core/tests/cmdline_cat_test.c b/grub-core/tests/cmdline_cat_test.c
index 55e90a9d7..3337d34cb 100644
--- a/grub-core/tests/cmdline_cat_test.c
+++ b/grub-core/tests/cmdline_cat_test.c
@@ -74,6 +74,7 @@ cmdline_cat_test (void)
   unsigned i;
 
   grub_dl_load ("gfxterm");
+  grub_errno = GRUB_ERR_NONE;
 
   if (grub_font_load ("unicode") == 0)
     {
diff --git a/grub-core/tests/gfxterm_menu.c b/grub-core/tests/gfxterm_menu.c
index 915875909..68531892f 100644
--- a/grub-core/tests/gfxterm_menu.c
+++ b/grub-core/tests/gfxterm_menu.c
@@ -101,6 +101,10 @@ gfxterm_menu (void)
   grub_dl_load ("gettext");
   grub_dl_load ("gfxterm");
 
+  grub_errno = GRUB_ERR_NONE;
+
+  grub_dl_load ("gfxmenu");
+
   if (grub_font_load ("unicode") == 0)
     {
       grub_test_assert (0, "unicode font not found: %s", grub_errmsg);