diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm
index be29e266..a5c39852 100644
--- a/tests/_graphical_wait_login.pm
+++ b/tests/_graphical_wait_login.pm
@@ -58,9 +58,25 @@ 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
+            # this happened already. Also, as of 2017-04 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.
             unless (get_var("_setup_done")) {
-                gnome_initial_setup();
+                if (get_var("ADVISORY")) {
+                    assert_screen ["next_button", "getting_started"], 120;
+                    if (match_has_tag("next_button")) {
+                        gnome_initial_setup();
+                    }
+                    else {
+                        send_key "alt-f4";
+                        set_var("_setup_done", 1);
+                    }
+                }
+                else {
+                    gnome_initial_setup();
+                }
             }
         }
         if (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) {