diff --git a/20_memtest86+ b/20_memtest86+
index 185d837..97c5bfd 100644
--- a/20_memtest86+
+++ b/20_memtest86+
@@ -23,6 +23,12 @@ set -e
 export TEXTDOMAIN=grub2
 export TEXTDOMAINDIR=/usr/share/locale
 
+# memset86+ requires the x86 real mode
+# which is not available with UEFI booting.
+if [ -d /sys/firmware/efi ]; then
+  exit 0
+fi
+
 CLASS="--class memtest86 --class gnu --class tools"
 
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
diff --git a/grub2.changes b/grub2.changes
index baeb394..e9991ec 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 30 14:47:39 UTC 2016 - sor.alexei@meowr.ru
+
+- 20_memtest86+: avoid adding memtest86+ to the list with UEFI
+  booting.
+
 -------------------------------------------------------------------
 Fri Oct 28 04:08:19 UTC 2016 - mchang@suse.com