diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 3e4ce78..e50ed3a 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -30,6 +30,12 @@ kernel
 kernel-modules
 kernel-modules-extra
 
+# This was added a while ago, I think it falls into the category of
+# "Diagnosis/recovery tool useful from a Live OS image".  Leaving this untouched
+# for now.
+#memtest86+
+@x86-baremetal-tools # memtest86+ is included
+
 # The point of a live image is to install
 anaconda
 anaconda-install-env-deps