diff --git a/main.pm b/main.pm
index 4a04f76b..7ed4f9ec 100644
--- a/main.pm
+++ b/main.pm
@@ -71,10 +71,7 @@ else
         }
 
         ## Select package set. Minimal is the default, if 'default' is specified, skip selection.
-        my $packageset = get_var('PACKAGE_SET', 'minimal');
-        unless ($packageset eq 'default') {
-            autotest::loadtest get_var('CASEDIR')."/tests/_select_".$packageset.".pm";
-        }
+        autotest::loadtest get_var('CASEDIR')."/tests/_software_selection.pm";
 
         ## Disk partitioning
         if (get_var('DISK_GUIDED_MULTI')) {
diff --git a/needles/anaconda_minimal_highlighted.json b/needles/anaconda_minimal_highlighted.json
new file mode 100644
index 00000000..7913c40e
--- /dev/null
+++ b/needles/anaconda_minimal_highlighted.json
@@ -0,0 +1,18 @@
+{
+  "properties": [],
+  "tags": [
+    "anaconda_minimal_highlighted",
+    "ENV-DISTRI-fedora",
+    "ENV-INSTLANG-en_US",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "xpos": 30,
+      "ypos": 681,
+      "width": 115,
+      "height": 15,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_minimal_highlighted.png b/needles/anaconda_minimal_highlighted.png
new file mode 100644
index 00000000..62e94aad
Binary files /dev/null and b/needles/anaconda_minimal_highlighted.png differ
diff --git a/needles/anaconda_minimal_selected.json b/needles/anaconda_minimal_selected.json
new file mode 100644
index 00000000..7905bb7a
--- /dev/null
+++ b/needles/anaconda_minimal_selected.json
@@ -0,0 +1,18 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "xpos": 30,
+      "ypos": 681,
+      "width": 114,
+      "height": 14,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "anaconda_minimal_selected",
+    "ENV-DISTRI-fedora",
+    "ENV-INSTLANG-en_US",
+    "ENV-FLAVOR-server"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_minimal_selected.png b/needles/anaconda_minimal_selected.png
new file mode 100644
index 00000000..0ebd90ab
Binary files /dev/null and b/needles/anaconda_minimal_selected.png differ
diff --git a/tests/_select_minimal.pm b/tests/_software_selection.pm
similarity index 51%
rename from tests/_select_minimal.pm
rename to tests/_software_selection.pm
index 9e71d69d..ca70e60e 100644
--- a/tests/_select_minimal.pm
+++ b/tests/_software_selection.pm
@@ -3,19 +3,33 @@ use strict;
 use testapi;
 
 sub run {
+    # Select package set. Minimal is the default, if 'default' is specified, skip selection.
+    my $packageset = get_var('PACKAGE_SET', 'minimal');
+    if ($packageset eq 'default') {
+        return
+    }
+    
     # Anaconda hub
     assert_screen "anaconda_main_hub", 300; #
 
     assert_and_click "anaconda_main_hub_select_packages";
 
-    assert_and_click "anaconda_software_select_box";
+    # Focus on "base environment" list
+    send_key "tab";
+    sleep 1;
+    send_key "tab";
 
-    for (my $i = 0; $i < 20; $i++) {
+    # 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";
 
+    # check that desired environment is selected
+    assert_screen "anaconda_".$packageset."_selected";
+
     assert_and_click "anaconda_spoke_done";
 
     # Anaconda hub