diff --git a/TODO b/TODO
index b205a88f37..48c003a5b7 100644
--- a/TODO
+++ b/TODO
@@ -5,11 +5,10 @@ Bugs:
 * when plymouth is disabled the console password entry stuff seems to be borked
   https://bugzilla.redhat.com/show_bug.cgi?id=655538
 
-* exclude java hsp files by default
-  https://bugzilla.redhat.com/show_bug.cgi?id=527425
-
 Features:
 
+* support "auto" and "comment=systemd.automount" at the same time for an fstab entry
+
 * Make use of UnknownInterface, UnknownObject
 
 * increase password timeout
@@ -124,8 +123,6 @@ External:
 
 * snd-seq should go, https://bugzilla.redhat.com/show_bug.cgi?id=676095
 
-* mount.tmpfs should be optimized, https://bugzilla.redhat.com/show_bug.cgi?id=676100
-
 * gnome-shell python script/glxinfo/is-accelerated wech
 
 * make cryptsetup lower --iter-time
diff --git a/src/main.c b/src/main.c
index 96a282a34f..d1be83d44f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1012,6 +1012,11 @@ int main(int argc, char *argv[]) {
         if (parse_argv(argc, argv) < 0)
                 goto finish;
 
+        if (arg_action == ACTION_TEST && geteuid() == 0) {
+                log_error("Don't run test mode as root.");
+                goto finish;
+        }
+
         /* If Plymouth is being run make sure we show the status, so
          * that there's something nice to see when people press Esc */
         if (access("/dev/.systemd/plymouth", F_OK) >= 0)