diff --git a/needles/anaconda_install_password_dictionary_error.json b/needles/anaconda_install_password_dictionary_error.json
new file mode 100644
index 00000000..eec65452
--- /dev/null
+++ b/needles/anaconda_install_password_dictionary_error.json
@@ -0,0 +1,19 @@
+{
+  "tags": [
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-english",
+    "anaconda_install_password_dictionary_error"
+  ],
+  "area": [
+    {
+      "xpos": 511,
+      "ypos": 742,
+      "width": 145,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [
+    "workaround"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_password_dictionary_error.png b/needles/anaconda_install_password_dictionary_error.png
new file mode 100644
index 00000000..f9889cdd
Binary files /dev/null and b/needles/anaconda_install_password_dictionary_error.png differ
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index 26061d88..360a0e07 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -21,6 +21,9 @@ sub run {
     send_key "tab";
     type_string $root_password;
     assert_and_click "anaconda_spoke_done";
+    if (check_screen "anaconda_install_password_dictionary_error", 10) {
+            assert_and_click "anaconda_spoke_done";
+    }
 
     # Set user details
     sleep 1;
@@ -35,6 +38,10 @@ sub run {
     type_string $user_password;
     assert_and_click "anaconda_install_user_creation_make_admin";
     assert_and_click "anaconda_spoke_done";
+    # handle 'weak password' due to dictionary error: WORKAROUND
+    if (check_screen "anaconda_install_password_dictionary_error", 10) {
+            assert_and_click "anaconda_spoke_done";
+    }
 
     # Check username (and hence keyboard layout) if non-English
     if (get_var('LANGUAGE')) {