diff --git a/tests/_software_selection.pm b/tests/_software_selection.pm
index 22a9c94a..ea55abcb 100644
--- a/tests/_software_selection.pm
+++ b/tests/_software_selection.pm
@@ -28,18 +28,10 @@ sub run {
     }
 
     assert_and_click "anaconda_main_hub_select_packages";
-
-    # Focus on "base environment" list
-    send_key "tab";
-    wait_still_screen 1;
-    send_key "tab";
-    wait_still_screen 1;
+    wait_still_screen 3;
 
     # select desired environment
-    # go through the list 20 times at max (to prevent infinite loop when it's missing)
-    for (my $i = 0; !check_screen("anaconda_${packageset}_highlighted", 1) && $i < 20; $i++) {
-        send_key "down";
-    }
+    send_key_until_needlematch "anaconda_${packageset}_highlighted", "tab";
 
     send_key "spc";