diff --git a/tests/desktop_update_graphical.pm b/tests/desktop_update_graphical.pm
index 8f5e05cd..b2595109 100644
--- a/tests/desktop_update_graphical.pm
+++ b/tests/desktop_update_graphical.pm
@@ -13,9 +13,7 @@ sub run {
     prepare_test_packages;
     # sometimes, the test is failing because it cannot
     # refresh packages for Gnome Software. Let's do it explicitely.
-    script_run "su test", 10;
     script_run "pkcon refresh force", 60;
-    script_run "exit", 10;
     # get back to the desktop
     desktop_vt;
     # run the updater
@@ -49,9 +47,9 @@ sub run {
     # if this is KDE and it had already noticed the notification, we
     # will already have the apply button at this point
     unless (check_screen 'desktop_package_tool_update_apply', 5) {
-        # refresh updates
-        assert_and_click 'desktop_package_tool_update_refresh';
-        wait_still_screen 20;
+        assert_and_click 'desktop_package_tool_update_refresh', '', 120;
+    }
+    unless (check_screen 'desktop_package_tool_update_apply', 5) {
         assert_and_click 'desktop_package_tool_update_refresh', '', 120;
     }
     # wait for refresh, then apply updates, using a C-style loop so we