diff --git a/tests/upgrade_run.pm b/tests/upgrade_run.pm
index 4c5bc95a..87ebb3a9 100644
--- a/tests/upgrade_run.pm
+++ b/tests/upgrade_run.pm
@@ -24,9 +24,9 @@ sub run {
 
             # If it is run for the first time, hit the Browse button to
             # speed things up.
-            if (check_screen("gnome_software_browse_button")) {
-                assert_and_click("gnome_software_browse_button");
-            }
+	    if (check_screen("gnome_software_browse_button", timeout => 60)) {
+	            assert_and_click("gnome_software_browse_button");
+	    }
 
             # Click on the updates button. There should be no updates available,
             # as updates were already handled by the upgrade_preinstall test, 
@@ -41,12 +41,12 @@ sub run {
 
             # Wait until it gets downloaded. It can take a long time, so
             # we will do regular checks.
-            wait_until_needlematch("gnome_software_new_install", 10, 120);
+            wait_until_needlematch("gnome_software_new_install", 10, 600);
 
             # Click to Install the updates
             assert_and_click("gnome_software_new_install");
 
-            if (check_screen("gnome_software_authenticate")) {
+            if (check_screen("gnome_software_authenticate", timeout => 60)) {
                 # If authentication dialogue, then authenticate
                 type_safely(get_var("USER_PASSWORD"));
                 send_key("ret");
@@ -55,9 +55,8 @@ sub run {
                 die("There was no authentication dialogue requested for an activity where it should have been.");
             }
 
-            if (check_screen("gnome_software_restart")) {
-                assert_and_click("gnome_software_restart");
-            }
+            assert_and_click("gnome_software_restart");
+	    
         }
 
     }