diff --git a/ChangeLog b/ChangeLog
index 0c3856218..8de6c8262 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-26  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* tests/test_unset.in: New test.
+
 2013-10-26  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* tests/test_sha512sum.in: New test.
diff --git a/Makefile.util.def b/Makefile.util.def
index 15f28a0ec..193bc4531 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -863,6 +863,12 @@ script = {
   common = tests/test_sha512sum.in;
 };
 
+script = {
+  testcase;
+  name = test_unset;
+  common = tests/test_unset.in;
+};
+
 script = {
   testcase;
   name = grub_func_test;
diff --git a/tests/test_unset.in b/tests/test_unset.in
new file mode 100644
index 000000000..30f1a255c
--- /dev/null
+++ b/tests/test_unset.in
@@ -0,0 +1,10 @@
+#! @builddir@/grub-shell-tester
+
+foo=one
+echo $foo
+
+unset foo
+echo $foo
+echo ${foo}
+
+