diff --git a/ChangeLog b/ChangeLog
index 304874db3..fdbf83aea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/tests/gfxterm_menu.c (gfxterm_menu): Handle out-of-memory
+	condition.
+	* tests/grub_func_test.in: Increase memory allocation.
+
 2013-11-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/osdep/unix/getroot.c [HAVE_STRUCT_STATFS_F_FSTYPENAME
diff --git a/grub-core/tests/gfxterm_menu.c b/grub-core/tests/gfxterm_menu.c
index 82c38027a..bb456a2ae 100644
--- a/grub-core/tests/gfxterm_menu.c
+++ b/grub-core/tests/gfxterm_menu.c
@@ -116,6 +116,12 @@ gfxterm_menu (void)
 	grub_video_capture_start (&grub_test_video_modes[i],
 				  grub_video_fbstd_colors,
 				  grub_test_video_modes[i].number_of_colors);
+	if (grub_errno)
+	  {
+	    grub_test_assert (0, "can't start capture: %d: %s",
+			      grub_errno, grub_errmsg);
+	    return;
+	  }
 	grub_terminal_input_fake_sequence ((int []) { -1, -1, -1, GRUB_TERM_KEY_DOWN, -1, 'e',
 	      -1, GRUB_TERM_KEY_RIGHT, -1, 'x', -1,  '\e', -1, '\e' }, 14);
 
diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in
index 62eb07c51..c039ffde0 100644
--- a/tests/grub_func_test.in
+++ b/tests/grub_func_test.in
@@ -3,7 +3,8 @@ set -e
 
 . "@builddir@/grub-core/modinfo.sh"
 
-out=`echo all_functional_test | @builddir@/grub-shell --timeout=3600 --files="/boot/grub/fonts/unicode.pf2"="@builddir@/"unicode.pf2`
+# Increase memory as some of tests are high-resolution and need a lot of memory.
+out=`echo all_functional_test | @builddir@/grub-shell --timeout=3600 --files="/boot/grub/fonts/unicode.pf2"="@builddir@/"unicode.pf2 --qemu-opts="-m 512"`
 
 if [ "$(echo "$out" | tail -n 1)" != "ALL TESTS PASSED" ]; then
   echo "Functional test failure: $out"