diff --git a/needles/boot_enter_passphrase2.json b/needles/boot_enter_passphrase2.json
new file mode 100644
index 00000000..6fcd7450
--- /dev/null
+++ b/needles/boot_enter_passphrase2.json
@@ -0,0 +1,18 @@
+{
+  "tags": [
+    "boot_enter_passphrase",
+    "ENV-DISTRI-fedora",
+    "ENV-INSTLANG-en_US",
+    "ENV-OFW-1",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "xpos": 0,
+      "ypos": 361,
+      "width": 188,
+      "height": 31,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/boot_enter_passphrase2.png b/needles/boot_enter_passphrase2.png
new file mode 100644
index 00000000..e3930b5a
Binary files /dev/null and b/needles/boot_enter_passphrase2.png differ
diff --git a/tests/_software_selection.pm b/tests/_software_selection.pm
index ca70e60e..1b0e78d2 100644
--- a/tests/_software_selection.pm
+++ b/tests/_software_selection.pm
@@ -3,14 +3,14 @@ use strict;
 use testapi;
 
 sub run {
+    # Anaconda hub
+    assert_screen "anaconda_main_hub", 300; #
+
     # 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";