diff --git a/tests/upgrade_boot.pm b/tests/upgrade_boot.pm
index aecf7b42..6bf40895 100644
--- a/tests/upgrade_boot.pm
+++ b/tests/upgrade_boot.pm
@@ -33,17 +33,13 @@ sub run {
         # First, let's become the corresponding user.
         my $login = get_var("USER_LOGIN") // "test";
         my $password = get_var("USER_PASSWORD") // "weakpassword";
-        send_key("ctrl-alt-f3");
-        wait_still_screen(2);
-        #console_login($login, $password);
-        type_string("$login\n");
-        sleep 2;
-        type_string("$password\n");
-        sleep 3;
+        desktop_login($login, $password);
+        # Run Terminal to be able to issue commands
+        menu_type_launch("gnome-terminal");
         # Use gsettings to enable prerelease versions to be shown
         type_string("gsettings set org.gnome.software show-upgrade-prerelease true\n");
         sleep 2;
-        type_string("logout\n");
+        type_string("exit\n");
     }
      
     # switch to TTY3 for both, graphical and console tests