diff --git a/ChangeLog b/ChangeLog
index cd8213a1b..f7b3efe2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* tests/util/grub-shell.in: Remove the temporary directory on grub-emu
+	after the test.
+
 2013-05-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-install.in: Gettextize "Not found" message.
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index f259bb3f9..a0ec1ac23 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -418,6 +418,7 @@ elif [ x$boot = xemu ]; then
     cp "${cfgfile}" "$grubdir/grub.cfg"
     cp "${source}" "$grubdir/testcase.cfg"
     @builddir@/grub-core/grub-emu -m "$device_map" -d "$grubdir" | tr -d "\r" | do_trim
+    rm -rf "$grubdir"
 else
     timeout -s KILL $timeout "${qemu}" ${qemuopts} -nographic ${serial_null} -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r" | do_trim
 fi