diff --git a/tests/upgrade_boot.pm b/tests/upgrade_boot.pm
index 253df66b..5fe1bc27 100644
--- a/tests/upgrade_boot.pm
+++ b/tests/upgrade_boot.pm
@@ -36,10 +36,11 @@ sub run {
         desktop_login($login, $password);
         # Run Terminal to be able to issue commands
         menu_launch_type("gnome-terminal");
+        wait_still_screen(3);
         # Use gsettings to enable prerelease versions to be shown
-        type_string("gsettings set org.gnome.software show-upgrade-prerelease true\n");
+        type_safely("gsettings set org.gnome.software show-upgrade-prerelease true\n");
         sleep 2;
-        type_string("exit\n");
+        type_safely("exit\n");
     }
      
     # switch to TTY3 for both, graphical and console tests