diff --git a/django/forms/forms.py b/django/forms/forms.py
index d484300a0d..c53a901e73 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -138,9 +138,9 @@ class BaseForm(StrAndUnicode):
         "Helper function for outputting HTML. Used by as_table(), as_ul(), as_p()."
         top_errors = self.non_field_errors() # Errors that should be displayed above all fields.
         output, hidden_fields = [], []
-        html_class_attr = ''
 
         for name, field in self.fields.items():
+            html_class_attr = ''
             bf = BoundField(self, field, name)
             bf_errors = self.error_class([conditional_escape(error) for error in bf.errors]) # Escape and cache in local variable.
             if bf.is_hidden:
diff --git a/tests/regressiontests/forms/forms.py b/tests/regressiontests/forms/forms.py
index 5f9f5dec5d..f9498c41e2 100644
--- a/tests/regressiontests/forms/forms.py
+++ b/tests/regressiontests/forms/forms.py
@@ -1816,6 +1816,12 @@ True
 
 # The error_html_class and required_html_class attributes ####################
 
+>>> class Person(Form):
+...     name = CharField()
+...     is_cool = NullBooleanField()
+...     email = EmailField(required=False)
+...     age = IntegerField()
+
 >>> p = Person({})
 >>> p.error_css_class = 'error'
 >>> p.required_css_class = 'required'
@@ -1827,6 +1833,8 @@ True
 <option value="2">Yes</option>
 <option value="3">No</option>
 </select></li>
+<li><label for="id_email">Email:</label> <input type="text" name="email" id="id_email" /></li>
+<li class="required error"><ul class="errorlist"><li>This field is required.</li></ul><label for="id_age">Age:</label> <input type="text" name="age" id="id_age" /></li>
 
 >>> print p.as_p()
 <ul class="errorlist"><li>This field is required.</li></ul>
@@ -1836,6 +1844,9 @@ True
 <option value="2">Yes</option>
 <option value="3">No</option>
 </select></p>
+<p><label for="id_email">Email:</label> <input type="text" name="email" id="id_email" /></p>
+<ul class="errorlist"><li>This field is required.</li></ul>
+<p class="required error"><label for="id_age">Age:</label> <input type="text" name="age" id="id_age" /></p>
 
 >>> print p.as_table()
 <tr class="required error"><th><label for="id_name">Name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="name" id="id_name" /></td></tr>
@@ -1844,6 +1855,8 @@ True
 <option value="2">Yes</option>
 <option value="3">No</option>
 </select></td></tr>
+<tr><th><label for="id_email">Email:</label></th><td><input type="text" name="email" id="id_email" /></td></tr>
+<tr class="required error"><th><label for="id_age">Age:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="age" id="id_age" /></td></tr>