diff --git a/lib/utils.pm b/lib/utils.pm
index 3350f202..a7e8a54d 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -242,14 +242,16 @@ sub do_bootloader {
     if (match_has_tag "upgrade_complete") {
         # this is a workaround for RHBZ #1674045 during upgrades
         # let's check we didn't just happen to catch it for the
-        # brief time it's displayed normally...
-        sleep 10;
-        if (check_screen "upgrade_complete") {
-            record_soft_failure "Upgrade hung at end - probably RHBZ #1674045";
-            power 'reset';
+        # brief time it's displayed normally, and catch the boot
+        # loader if it shows up
+        unless (check_screen $boottag, 10) {
+            if (check_screen "upgrade_complete") {
+                record_soft_failure "Upgrade hung at end - probably RHBZ #1674045";
+                power 'reset';
+            }
+            # now let's just assume we'll get to the bootloader soon
+            assert_screen $boottag, 60;
         }
-        # now let's just assume we'll get to the bootloader soon
-        assert_screen $boottag, 60;
     }
     if ($args{mutex}) {
         # cancel countdown