diff --git a/src/openforms/forms/tests/e2e_tests/test_form_designer.py b/src/openforms/forms/tests/e2e_tests/test_form_designer.py
index 1686295ed6..398eaa004c 100644
--- a/src/openforms/forms/tests/e2e_tests/test_form_designer.py
+++ b/src/openforms/forms/tests/e2e_tests/test_form_designer.py
@@ -1338,7 +1338,6 @@ def setUpTestData():
                             },
                         },
                         {"type": "number", "key": "number", "label": "Number 1"},
-                        {"type": "password", "key": "password", "label": "Password 1"},
                         {
                             "type": "phoneNumber",
                             "key": "phoneNumber",
@@ -1440,7 +1439,6 @@ def setUpTestData():
                 "IBAN 1",
                 "License plate 1",
                 "Number 1",
-                "Password 1",
                 "Phone Number 1",
                 "Postcode 1",
                 "Radio 1",
diff --git a/src/openforms/registrations/contrib/email/tests/test_backend.py b/src/openforms/registrations/contrib/email/tests/test_backend.py
index ec6dcf0293..3fd74b4a4a 100644
--- a/src/openforms/registrations/contrib/email/tests/test_backend.py
+++ b/src/openforms/registrations/contrib/email/tests/test_backend.py
@@ -630,12 +630,6 @@ def test_regression_nested_components_columns(self):
                     "label": "Dropdown met zoekfunctie",
                     "showInEmail": True,
                 },
-                {
-                    "key": "wachtwoord",
-                    "label": "Wachtwoord",
-                    "showInEmail": True,
-                    "type": "password",
-                },
                 {
                     "key": "favorieteComponenten",
                     "label": "Favoriete componenten?",
diff --git a/src/openforms/submissions/tests/test_tasks_confirmation_emails.py b/src/openforms/submissions/tests/test_tasks_confirmation_emails.py
index 2553de2951..f386508816 100644
--- a/src/openforms/submissions/tests/test_tasks_confirmation_emails.py
+++ b/src/openforms/submissions/tests/test_tasks_confirmation_emails.py
@@ -542,7 +542,6 @@ def test_template_is_rendered_in_submission_language(self):
                 ],
                 submitted_data={
                     "email": "abuse@example.com",
-                    "fubar": "Haveibeenpwned.com123!@#",
                     "editgrid1": [
                         {
                             "radio1": "radiov2",
@@ -565,14 +564,6 @@ def test_template_is_rendered_in_submission_language(self):
                             "label": "Label with no translation",
                             "showInEmail": True,
                         },
-                        {
-                            "key": "fubar",
-                            "type": "password",
-                            "label": "Label with no translation",
-                            # XXX cleartext "password" in email, for when you
-                            # run out of room for Post-it™ on your monitor.
-                            "showInEmail": True,
-                        },
                         {
                             "type": "editgrid",
                             "key": "editgrid1",
@@ -692,7 +683,6 @@ def test_template_is_rendered_in_submission_language(self):
         self.assertIn("Translated Repeating Group Item label 2", html_message)
         self.assertIn("Translated Radio option 1", html_message)
         self.assertIn("Translated Select option 2", html_message)
-        self.assertIn("Haveibeenpwned.com123!@#", html_message)
 
 
 class RaceConditionTests(TransactionTestCase):
diff --git a/src/openforms/submissions/tests/test_variables/test_variable_injection.py b/src/openforms/submissions/tests/test_variables/test_variable_injection.py
index 9b4bdf4987..9d435cc3d3 100644
--- a/src/openforms/submissions/tests/test_variables/test_variable_injection.py
+++ b/src/openforms/submissions/tests/test_variables/test_variable_injection.py
@@ -254,7 +254,7 @@ def setUpTestData(cls):
                 },
                 {
                     "key": "ww",
-                    "type": "password",
+                    "type": "textfield",
                     "label": "Wachtwoord",
                     "description": 'Suggestie: #{{naam|title}}{{geboortedatum|date:"Y"}}',
                     "openForms": {