diff --git a/ChangeLog b/ChangeLog
index 68694c7bd..e1a7d8f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,11 @@
 	* util/grub-install-common.c (grub_install_copy_files): Fix module
 	destination directory.
 
+2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
+
+	* tests/util/grub-shell.in: Don't fail on emu platform if po/*.gmo
+	files have not been built.
+
 2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/osdep/unix/hostdisk.c (grub_util_make_temporary_file):
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index b0081cb7f..b3632a883 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -434,7 +434,11 @@ elif [ x$boot = xemu ]; then
     mkdir -p "$grubdir/locale"
     cp "@builddir@/"unicode.pf2 "$grubdir/fonts/unicode.pf2"
     cp -R "@srcdir@/themes/starfield" "$grubdir/themes/starfield"
-    cp -R "@srcdir@/po/"*.gmo "$grubdir/locale/"
+    for file in "@srcdir@/po/"*.gmo; do
+	if [ -f "$file" ]; then
+	    cp "$file" "$grubdir/locale/"
+	fi
+    done
     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