diff --git a/tests/desktop_update_graphical.pm b/tests/desktop_update_graphical.pm
index e2bd7209..542def2a 100644
--- a/tests/desktop_update_graphical.pm
+++ b/tests/desktop_update_graphical.pm
@@ -13,7 +13,9 @@ 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 qq(su -c "pkcon refresh force" -s /bin/sh test), 60;
+    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
diff --git a/tests/desktop_upgrade_graphical.pm b/tests/desktop_upgrade_graphical.pm
index 4c18d177..ae1741e6 100644
--- a/tests/desktop_upgrade_graphical.pm
+++ b/tests/desktop_upgrade_graphical.pm
@@ -21,8 +21,8 @@ sub run {
     # this launches GNOME Software on GNOME, dunno for any other
     # desktop yet
     send_key 'alt-f1';
-    wait_still_screen 5;
-    menu_launch_type('update');
+    wait_still_screen 2;
+    assert_and_click 'overview_package_tool_icon';
     wait_still_screen 5;
     
     # GNOME Software has a welcome screen, get rid of it if it shows