2 files changed, 9 insertions, 0 deletions
diff --git a/tests/model_forms/models.py b/tests/model_forms/models.py
index 1b5ae90b07..4ab681d1ae 100644
--- a/tests/model_forms/models.py
+++ b/tests/model_forms/models.py
@@ -381,6 +381,8 @@ class CustomErrorMessage(models.Model):
     def clean(self):
         if self.name1 == 'FORBIDDEN_VALUE':
             raise ValidationError({'name1': [ValidationError('Model.clean() error messages.')]})
+        elif self.name1 == 'FORBIDDEN_VALUE2':
+            raise ValidationError({'name1': 'Model.clean() error messages (simpler syntax).'})
         elif self.name1 == 'GLOBAL_ERROR':
             raise ValidationError("Global error message.")
 
diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py
index 962e5b969f..4ff900e1b2 100644
--- a/tests/model_forms/tests.py
+++ b/tests/model_forms/tests.py
@@ -2269,6 +2269,13 @@ class ModelFormCustomErrorTests(TestCase):
             str(form.errors['name1']),
             '<ul class="errorlist"><li>Model.clean() error messages.</li></ul>'
         )
+        data = {'name1': 'FORBIDDEN_VALUE2', 'name2': 'ABC'}
+        form = CustomErrorMessageForm(data)
+        self.assertFalse(form.is_valid())
+        self.assertHTMLEqual(
+            str(form.errors['name1']),
+            '<ul class="errorlist"><li>Model.clean() error messages (simpler syntax).</li></ul>'
+        )
         data = {'name1': 'GLOBAL_ERROR', 'name2': 'ABC'}
         form = CustomErrorMessageForm(data)
         self.assertFalse(form.is_valid())