diff --git a/tests/_console_avc_crash.pm b/tests/_console_avc_crash.pm
index b0b31634..4ec8ee8f 100644
--- a/tests/_console_avc_crash.pm
+++ b/tests/_console_avc_crash.pm
@@ -5,6 +5,13 @@ use testapi;
 sub run {
     my $self = shift;
     $self->root_console(tty=>3);
+    # if this is a non-English, non-switched layout, load US layout
+    # at this point
+    # FIXME: this is all kind of a mess, as on such configs we need
+    # native layout to log in to a console but US layout to type
+    # anything at a console. the more advanced upstream 'console'
+    # handling may help us here if we switch to it
+    console_loadkeys_us;
     # check there are no AVCs. We use ! because this returns 1
     validate_script_output '! ausearch -m avc -ts yesterday 2>&1', sub { $_ =~ m/<no matches>/ };
     # check there are no crashes
diff --git a/tests/_console_wait_login.pm b/tests/_console_wait_login.pm
index 801b8cef..79c712a6 100644
--- a/tests/_console_wait_login.pm
+++ b/tests/_console_wait_login.pm
@@ -24,10 +24,6 @@ sub run {
     }
     if (get_var("ROOT_PASSWORD")) {
         console_login(user=>"root", password=>get_var("ROOT_PASSWORD"));
-        # if this is a non-English, non-switched layout, load US layout
-        # at this point as we've already checked the default layout is
-        # the native one, and we might want to run other commands now
-        console_loadkeys_us;
     }
 }