diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm
index adba9e75..297d6f96 100644
--- a/tests/_boot_to_anaconda.pm
+++ b/tests/_boot_to_anaconda.pm
@@ -104,14 +104,16 @@ sub run {
                 unless (wait_serial "Installation") { die "Text version of Anaconda has not started."; }
             }
             else {
-                if (get_var("DISTRI") eq "rocky") {
-                    # Rocky doesn't have network enabled at boot so we are not prompted
-                    # for VNC...
+                if (get_var("DISTRI") eq "rocky" && (get_version_major() < 9)) {
+                    # Rocky Linux 8 doesn't have network enabled at boot so we
+                    # are not prompted for VNC. If that changes in future update
+                    # this conditional can be removed and the else condition
+                    # can be restored as the default / only option.
                     # wait for text version of Anaconda main hub
                     assert_screen "anaconda_main_hub_text", 300;
                 }
                 else {
-                    # Fedora has a use text mode menu here
+                    # Fedora and Rocky Linux 9+ have a 'Use text mode' menu here
                     assert_screen "anaconda_use_text_mode", 300;
                     type_string "2\n";
                     # wait for text version of Anaconda main hub
diff --git a/tests/install_text.pm b/tests/install_text.pm
index 3ff6a32a..d02c9750 100644
--- a/tests/install_text.pm
+++ b/tests/install_text.pm
@@ -105,11 +105,6 @@ sub run {
     console_type_wait("1\n");    # create new
     console_type_wait("3\n");    # set username
     console_type_wait("$username\n");
-    # from Rawhide-20190503.n.0 (F31) onwards, 'use password' is default
-    if ((get_release_number() < 31) || (get_version_major() < 9)) {
-        # typing "4\n" on abrt screen causes system to reboot, so be careful
-        run_with_error_check(sub { console_type_wait("4\n") }, $error);    # use password
-    }
     console_type_wait("5\n");    # set password
     console_type_wait("$userpwd\n");
     console_type_wait("$userpwd\n");