diff --git a/tests/applications/gnome-initial-setup/aaa_setup.pm b/tests/applications/gnome-initial-setup/aaa_setup.pm
index 264ea452..ca6348ec 100644
--- a/tests/applications/gnome-initial-setup/aaa_setup.pm
+++ b/tests/applications/gnome-initial-setup/aaa_setup.pm
@@ -16,6 +16,8 @@ sub run {
     # Remove the user clear the system and force the gnome-initial-setup
     # to start on new boot.
     assert_script_run("loginctl kill-user $username");
+    # that might switch us back to GDM, switch away if so
+    $self->root_console(tty => 3) if (check_screen 'graphical_login', timeout => 30);
     assert_script_run("userdel -r $username");
 
     # Reboot the system to trigger GNOME initial setup