diff --git a/needles/anaconda/install_process/root_password_screen-20210824.json b/needles/anaconda/install_process/root_password_screen-20210824.json
new file mode 100644
index 00000000..7b392bd5
--- /dev/null
+++ b/needles/anaconda/install_process/root_password_screen-20210824.json
@@ -0,0 +1,21 @@
+{
+  "area": [
+    {
+      "ypos": 309,
+      "height": 15,
+      "type": "match",
+      "xpos": 266,
+      "width": 63,
+      "click_point": {
+        "xpos": 6.5,
+        "ypos": 7.5
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_install_root_password_screen",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-english"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/root_password_screen-20210824.png b/needles/anaconda/install_process/root_password_screen-20210824.png
new file mode 100644
index 00000000..f4690e86
Binary files /dev/null and b/needles/anaconda/install_process/root_password_screen-20210824.png differ
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index c99e78ec..92af89df 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -11,7 +11,10 @@ sub _set_root_password {
     my $root_password = get_var("ROOT_PASSWORD") || "weakpassword";
     unless (get_var("INSTALLER_NO_ROOT")) {
         assert_and_click "anaconda_install_root_password";
-        assert_screen "anaconda_install_root_password_screen";
+        # from anaconda-35.22.1 onwards, we have to click 'enable root
+        # account' before typing the password. For older versions,
+        # clicking this needle does nothing but is harmless
+        assert_and_click "anaconda_install_root_password_screen";
         # wait out animation
         wait_still_screen 2;
         desktop_switch_layout("ascii", "anaconda") if (get_var("SWITCHED_LAYOUT"));