2 files changed, 18 insertions, 0 deletions
diff --git a/tests/forms_tests/field_tests/test_emailfield.py b/tests/forms_tests/field_tests/test_emailfield.py
index 4d37a7dc00..906a6cf5ff 100644
--- a/tests/forms_tests/field_tests/test_emailfield.py
+++ b/tests/forms_tests/field_tests/test_emailfield.py
@@ -51,3 +51,12 @@ class EmailFieldTest(FormFieldAssertionsMixin, SimpleTestCase):
         self.assertEqual('alf@foo.com', f.clean('alf@foo.com'))
         with self.assertRaisesMessage(ValidationError, "'Ensure this value has at most 15 characters (it has 20).'"):
             f.clean('alf123456788@foo.com')
+
+    def test_emailfield_strip_on_none_value(self):
+        f = EmailField(required=False, empty_value=None)
+        self.assertIsNone(f.clean(None))
+
+    def test_emailfield_unable_to_set_strip_kwarg(self):
+        msg = "__init__() got multiple values for keyword argument 'strip'"
+        with self.assertRaisesMessage(TypeError, msg):
+            EmailField(strip=False)
diff --git a/tests/forms_tests/field_tests/test_urlfield.py b/tests/forms_tests/field_tests/test_urlfield.py
index 24da712717..d0b6d00482 100644
--- a/tests/forms_tests/field_tests/test_urlfield.py
+++ b/tests/forms_tests/field_tests/test_urlfield.py
@@ -151,3 +151,12 @@ class URLFieldTest(FormFieldAssertionsMixin, SimpleTestCase):
     def test_urlfield_normalization(self):
         f = URLField()
         self.assertEqual(f.clean('http://example.com/     '), 'http://example.com/')
+
+    def test_urlfield_strip_on_none_value(self):
+        f = URLField(required=False, empty_value=None)
+        self.assertIsNone(f.clean(None))
+
+    def test_urlfield_unable_to_set_strip_kwarg(self):
+        msg = "__init__() got multiple values for keyword argument 'strip'"
+        with self.assertRaisesMessage(TypeError, msg):
+            URLField(strip=False)