diff --git a/lib/utils.pm b/lib/utils.pm
index 681edcd7..82fc679f 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -440,9 +440,9 @@ sub setup_workaround_repo {
     assert_script_run "pushd /opt/workarounds_repo";
     my %workarounds = (
         "31" => [],
-        # krb5 reversions to fix RHBZ#1868482
-        "32" => ["FEDORA-2020-d10a284af3"],
-        "33" => ["FEDORA-2020-58970d693c"]
+        # FreeIPA 4.8.9 to make the UI consistent across releases
+        "32" => ["FEDORA-2020-dc32a8de93"],
+        "33" => []
     );
     # then we'll download each update for our release:
     my $advisories = $workarounds{$version};
diff --git a/tests/freeipa_password_change.pm b/tests/freeipa_password_change.pm
index 5e0b8315..acf04cde 100644
--- a/tests/freeipa_password_change.pm
+++ b/tests/freeipa_password_change.pm
@@ -24,7 +24,10 @@ sub run {
     assert_and_click "freeipa_webui_reset_password_link";
     wait_still_screen 3;
     type_safely "batterystaple";
-    type_safely "\t";
+    # The next box we need to type into was moved in FreeIPA 4.8.9,
+    # which is in F32+ but not F31
+    my $relnum = get_release_number;
+    $relnum < 32 ? type_safely "\t\t" : type_safely "\t";
     type_safely "loremipsum";
     wait_screen_change { send_key "tab"; };
     type_safely "loremipsum";