diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm
index e9994122..0b3e186e 100644
--- a/tests/_graphical_wait_login.pm
+++ b/tests/_graphical_wait_login.pm
@@ -58,13 +58,13 @@ sub run {
         if (get_var("DESKTOP") eq 'gnome' && (get_var("ADVISORY") || !get_var("START_AFTER_TEST"))) {
             # as this test gets loaded twice on the ADVISORY flow, and
             # we might be on the INSTALL_NO_USER flow, check whether
-            # this happened already. Also, as of 2017-04 there's a bug
+            # this happened already. Also, as of 2017-10 there's a bug
             # in the F26 base image which stops g-i-s running at all;
-            # for update testing purposes we don't want to fail, we
-            # just want to go ahead. So if we see the getting_started
-            # screen, just handle that instead.
+            # for update and upgrade testing purposes we don't want to
+            # fail, we just want to go ahead. So if we see the
+            # getting_started screen, just handle that instead.
             unless (get_var("_setup_done")) {
-                if (get_var("ADVISORY")) {
+                if (get_var("ADVISORY") || get_var("UPGRADE")) {
                     assert_screen ["next_button", "getting_started"], 120;
                     if (match_has_tag("next_button")) {
                         gnome_initial_setup();