diff --git a/django/contrib/admin/templates/admin/change_list_results.html b/django/contrib/admin/templates/admin/change_list_results.html
index 92e06c5fff..3f755783dc 100644
--- a/django/contrib/admin/templates/admin/change_list_results.html
+++ b/django/contrib/admin/templates/admin/change_list_results.html
@@ -1,3 +1,4 @@
+{% if results %}
 <table cellspacing="0">
 <thead>
 <tr>
@@ -7,7 +8,10 @@
 {% if header.sortable %}</a>{% endif %}</th>{% endfor %}
 </tr>
 </thead>
+<tbody>
 {% for result in results %}
 <tr class="{% cycle row1,row2 %}">{% for item in result %}{{ item }}{% endfor %}</tr>
 {% endfor %}
+</tbody>
 </table>
+{% endif %}
diff --git a/django/contrib/admin/templates/admin/search_form.html b/django/contrib/admin/templates/admin/search_form.html
index 5e868a06b0..c2d6cf59c5 100644
--- a/django/contrib/admin/templates/admin/search_form.html
+++ b/django/contrib/admin/templates/admin/search_form.html
@@ -2,7 +2,8 @@
 {% load i18n %}
 {% if cl.lookup_opts.admin.search_fields %}
 <div id="toolbar"><form id="changelist-search" action="" method="get">
-<label><img src="{% admin_media_prefix %}img/admin/icon_searchbox.png" /></label>
+<div><!-- DIV needed for valid HTML -->
+<label><img src="{% admin_media_prefix %}img/admin/icon_searchbox.png" alt="Search" /></label>
 <input type="text" size="40" name="{{ search_var }}" value="{{ cl.query|escape }}" id="searchbar" />
 <input type="submit" value="{% trans 'Go' %}" />
 {% if show_result_count %}
@@ -11,6 +12,7 @@
 {% for pair in cl.params.items %}
     {% ifnotequal pair.0 search_var %}<input type="hidden" name="{{ pair.0|escape }}" value="{{ pair.1|escape }}"/>{% endifnotequal %}
 {% endfor %}
+</div>
 </form></div>
 <script type="text/javascript">document.getElementById("searchbar").focus();</script>
 {% endif %}