diff --git a/Makefile.util.def b/Makefile.util.def
index 34b3648b1..c19f66115 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -557,6 +557,12 @@ script = {
   common = tests/partmap_test.in;
 };
 
+script = {
+  testcase;
+  name = grub_cmd_echo;
+  common = tests/grub_cmd_echo.in;
+};
+
 program = {
   testcase;
   name = example_unit_test;
diff --git a/tests/grub_cmd_echo.in b/tests/grub_cmd_echo.in
new file mode 100644
index 000000000..6ac33f55e
--- /dev/null
+++ b/tests/grub_cmd_echo.in
@@ -0,0 +1,33 @@
+#! @builddir@/grub-shell-tester
+#
+# Copyright (C) 2010  Free Software Foundation, Inc.
+#
+# GRUB is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GRUB is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+
+echo
+echo -n
+
+echo foo
+echo foo   bar
+
+echo -n foo
+
+echo -e "foo\nbar"
+
+echo -n -e "foo\nbar"
+
+echo foo -n
+echo foo -n -e
+
+echo -------