diff --git a/tests/desktop_upgrade_graphical.pm b/tests/desktop_upgrade_graphical.pm
index 04fa3ffb..498f24e0 100644
--- a/tests/desktop_upgrade_graphical.pm
+++ b/tests/desktop_upgrade_graphical.pm
@@ -39,7 +39,7 @@ sub run {
     assert_and_click 'desktop_package_tool_update','left', 120;
     wait_still_screen 2;
     # a banner should inform about new version, download it
-    assert_and_click 'desktop_package_tool_download','left', 1800;
+    assert_and_click 'desktop_package_tool_download','left', 120;
     wait_still_screen 5;
     # after the download, Install the updates
     assert_and_click 'desktop_package_tool_install','left', 1800;
@@ -65,7 +65,9 @@ sub run {
        assert_and_click('desktop_package_tool_authenticate','',60);
 
        assert_and_click('desktop_package_tool_restart','',30); 
-
+       while (check_screen('desktop_package_tool_upgrade_progress')) {
+            sleep 30;
+       } 
        boot_to_login_screen;
     }
     else {
diff --git a/tests/upgrade_preinstall.pm b/tests/upgrade_preinstall.pm
index 1d867887..9606b7ec 100644
--- a/tests/upgrade_preinstall.pm
+++ b/tests/upgrade_preinstall.pm
@@ -6,7 +6,7 @@ use utils;
 sub run {
     my $self = shift;
     # upgrader should be installed on up-to-date system
-    assert_script_run 'dnf -y update --refresh', 1800;
+    # assert_script_run 'dnf -y update --refresh', 1800;
     script_run "reboot", 0;
 
     # handle bootloader, if requested