diff --git a/tests/_software_selection.pm b/tests/_software_selection.pm
index 721c5595..07ec6d5b 100644
--- a/tests/_software_selection.pm
+++ b/tests/_software_selection.pm
@@ -39,13 +39,17 @@ sub run {
     send_key "tab";
     wait_still_screen 1;
 
-    # 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";
-    }
+    # In Rocky, graphical-server starts out selected in the DVD ISO so if that's
+    # what we're looking for we're done
+    if (!check_screen("anaconda_".$packageset."_selected", 1)) {
+      # 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 "spc";
+      send_key "spc";
+    }
 
     # check that desired environment is selected
     assert_screen "anaconda_".$packageset."_selected";