diff --git a/lib/fedorabase.pm b/lib/fedorabase.pm
index 2aa4bb4c..8b34b560 100644
--- a/lib/fedorabase.pm
+++ b/lib/fedorabase.pm
@@ -110,11 +110,11 @@ sub do_bootloader {
     # if not postinstall and not UEFI, syslinux
     $args{bootloader} //= ($args{uefi} || $args{postinstall}) ? "grub" : "syslinux";
     if ($args{uefi}) {
-        # we don't just tag all screens with 'bootloader' because we
-        # want to be sure we actually did a UEFI boot
+        # we use the firmware-type specific tags because we want to be
+        # sure we actually did a UEFI boot
         assert_screen "bootloader_uefi", $args{timeout};
     } else {
-        assert_screen "bootloader", $args{timeout};
+        assert_screen "bootloader_bios", $args{timeout};
     }
     if ($args{mutex}) {
         # cancel countdown
diff --git a/needles/console/bootloader_bios_installed.json b/needles/console/bootloader_bios_installed.json
index 83769e6c..08a16e36 100644
--- a/needles/console/bootloader_bios_installed.json
+++ b/needles/console/bootloader_bios_installed.json
@@ -10,6 +10,7 @@
     ],
     "tags": [
         "bootloader",
+        "bootloader_bios",
         "ENV-DISTRI-fedora"
     ]
 }
diff --git a/needles/console/bootloader_bios_live.json b/needles/console/bootloader_bios_live.json
index 98302bfd..bbc514a1 100644
--- a/needles/console/bootloader_bios_live.json
+++ b/needles/console/bootloader_bios_live.json
@@ -10,6 +10,7 @@
   ],
   "tags": [
     "bootloader",
+    "bootloader_bios",
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-server"
   ]
diff --git a/needles/console/bootloader_bios_offline.json b/needles/console/bootloader_bios_offline.json
index 98302bfd..bbc514a1 100644
--- a/needles/console/bootloader_bios_offline.json
+++ b/needles/console/bootloader_bios_offline.json
@@ -10,6 +10,7 @@
   ],
   "tags": [
     "bootloader",
+    "bootloader_bios",
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-server"
   ]
diff --git a/needles/console/bootloader_uefi.json b/needles/console/bootloader_uefi.json
index 5713b181..350b5f92 100644
--- a/needles/console/bootloader_uefi.json
+++ b/needles/console/bootloader_uefi.json
@@ -4,7 +4,8 @@
     "ENV-FLAVOR-server_boot",
     "ENV-FLAVOR-workstation_live",
     "ENV-UEFI-1",
-    "bootloader_uefi"
+    "bootloader_uefi",
+    "bootloader"
   ],
   "area": [
     {
diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm
index b36e4111..c3736498 100644
--- a/tests/_boot_to_anaconda.pm
+++ b/tests/_boot_to_anaconda.pm
@@ -28,8 +28,13 @@ sub run {
     $self->do_bootloader(postinstall=>0, params=>$params, mutex=>$mutex);
 
     # proceed to installer
-    unless (get_var("KICKSTART"))
-    {
+    if (get_var("KICKSTART")) {
+        # wait for the bootloader *here* - in a test that inherits from
+        # anacondatest - so that if something goes wrong during install,
+        # we get anaconda logs
+        assert_screen "bootloader", 1800;
+    }
+    else {
         if (get_var("ANACONDA_TEXT")) {
             # select that we don't want to start VNC; we want to run in text mode
             assert_screen "anaconda_use_text_mode", 300;
diff --git a/tests/_console_wait_login.pm b/tests/_console_wait_login.pm
index 8106e946..1c20b668 100644
--- a/tests/_console_wait_login.pm
+++ b/tests/_console_wait_login.pm
@@ -4,10 +4,8 @@ use testapi;
 
 sub run {
     my $self = shift;
-    # If KICKSTART is set, then the wait_time needs to consider the
-    # install time. if UPGRADE, we have to wait for the entire upgrade
+    # If UPGRADE is set, we have to wait for the entire upgrade
     my $wait_time = 300;
-    $wait_time = 1800 if (get_var("KICKSTART"));
     $wait_time = 6000 if (get_var("UPGRADE"));
 
     # handle bootloader, if requested