diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 5447970af..59cafd5d8 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -1,38 +1,51 @@
 {% load i18n static %}
+
 {% block css %}
-<link rel="stylesheet" href="{% static 'debug_toolbar/css/print.css' %}" media="print">
-<link rel="stylesheet" href="{% static 'debug_toolbar/css/toolbar.css' %}">
+    <link rel="stylesheet" href="{% static 'debug_toolbar/css/print.css' %}" media="print">
+    <link rel="stylesheet" href="{% static 'debug_toolbar/css/toolbar.css' %}">
 {% endblock %}
+
 {% block js %}
-<script type="module" src="{% static 'debug_toolbar/js/toolbar.js' %}" async></script>
+    <script type="module" src="{% static 'debug_toolbar/js/toolbar.js' %}" async></script>
 {% endblock %}
+
 <div id="djDebug" class="djdt-hidden" dir="ltr"
      {% if not toolbar.should_render_panels %}
-     data-store-id="{{ toolbar.store_id }}"
-     data-render-panel-url="{% url 'djdt:render_panel' %}"
+         data-store-id="{{ toolbar.store_id }}"
+         data-render-panel-url="{% url 'djdt:render_panel' %}"
      {% endif %}
      {% url 'djdt:history_sidebar' as history_url %}
      {% if history_url %}
-     data-sidebar-url="{{ history_url }}"
+         data-sidebar-url="{{ history_url }}"
      {% endif %}
      data-default-show="{% if toolbar.config.SHOW_COLLAPSED %}false{% else %}true{% endif %}"
-     {{ toolbar.config.ROOT_TAG_EXTRA_ATTRS|safe }}>
-  <div class="djdt-hidden" id="djDebugToolbar">
-    <ul id="djDebugPanelList">
-      <li><a id="djHideToolBarButton" href="#" title="{% trans 'Hide toolbar' %}">{% trans "Hide" %} »</a></li>
-      {% for panel in toolbar.panels %}
-        {% include "debug_toolbar/includes/panel_button.html" %}
-      {% endfor %}
-    </ul>
-  </div>
-  <div class="djdt-hidden" id="djDebugToolbarHandle">
-    <div title="{% trans 'Show toolbar' %}" id="djShowToolBarButton">
-      <span id="djShowToolBarD">D</span><span id="djShowToolBarJ">J</span>DT
+     {{ toolbar.config.ROOT_TAG_EXTRA_ATTRS|safe }}
+     aria-live="polite"
+     role="status"
+     aria-busy="{% if toolbar.config.SHOW_COLLAPSED %}true{% else %}false{% endif %}">
+
+    <div class="djdt-hidden" id="djDebugToolbar" aria-hidden="true">
+        <ul id="djDebugPanelList">
+            <li>
+                <a id="djHideToolBarButton" href="#" title="{% trans 'Hide toolbar' %}">
+                    {% trans "Hide" %} »
+                </a>
+            </li>
+            {% for panel in toolbar.panels %}
+                {% include "debug_toolbar/includes/panel_button.html" %}
+            {% endfor %}
+        </ul>
     </div>
-  </div>
 
-  {% for panel in toolbar.panels %}
-    {% include "debug_toolbar/includes/panel_content.html" %}
-  {% endfor %}
-  <div id="djDebugWindow" class="djdt-panelContent djdt-hidden"></div>
+    <div class="djdt-hidden" id="djDebugToolbarHandle">
+        <div title="{% trans 'Show toolbar' %}" id="djShowToolBarButton" role="button" tabindex="0">
+            <span id="djShowToolBarD">D</span><span id="djShowToolBarJ">J</span>DT
+        </div>
+    </div>
+
+    {% for panel in toolbar.panels %}
+        {% include "debug_toolbar/includes/panel_content.html" %}
+    {% endfor %}
+
+    <div id="djDebugWindow" class="djdt-panelContent djdt-hidden" aria-hidden="true"></div>
 </div>
diff --git a/debug_toolbar/templates/debug_toolbar/includes/panel_button.html b/debug_toolbar/templates/debug_toolbar/includes/panel_button.html
index 344331d8d..2dfbfce5a 100644
--- a/debug_toolbar/templates/debug_toolbar/includes/panel_button.html
+++ b/debug_toolbar/templates/debug_toolbar/includes/panel_button.html
@@ -1,11 +1,11 @@
 {% load i18n %}
 
-<li id="djdt-{{ panel.panel_id }}" class="djDebugPanelButton">
-  <input type="checkbox" data-cookie="djdt{{ panel.panel_id }}" {% if panel.enabled %}checked title="{% trans "Disable for next and successive requests" %}"{% else %}title="{% trans "Enable for next and successive requests" %}"{% endif %}>
+<li id="djdt-{{ panel.panel_id }}" class="djDebugPanelButton" role="checkbox">
+  <input type="checkbox" data-cookie="djdt{{ panel.panel_id }}" {% if panel.enabled %}checked title="{% trans "Disable for next and successive requests" %}"{% else %}title="{% trans "Enable for next and successive requests" %}"{% endif %} aria-label="{% if panel.enabled %}{% trans "Disable for next and successive requests" %}{% else %}{% trans "Enable for next and successive requests" %}{% endif %}">
   {% if panel.has_content and panel.enabled %}
-    <a href="#" title="{{ panel.title }}" class="{{ panel.panel_id }}">
+    <a href="#" title="{{ panel.title }}" class="{{ panel.panel_id }}" role="link">
   {% else %}
-    <div class="djdt-contentless{% if not panel.enabled %} djdt-disabled{% endif %}">
+    <div class="djdt-contentless{% if not panel.enabled %} djdt-disabled{% endif %}" role="presentation">
   {% endif %}
   {{ panel.nav_title }}
   {% if panel.enabled %}
diff --git a/debug_toolbar/templates/debug_toolbar/includes/panel_content.html b/debug_toolbar/templates/debug_toolbar/includes/panel_content.html
index 585682c61..43e68ea87 100644
--- a/debug_toolbar/templates/debug_toolbar/includes/panel_content.html
+++ b/debug_toolbar/templates/debug_toolbar/includes/panel_content.html
@@ -1,18 +1,18 @@
-{% load static %}
+{% load i18n static %}
 
 {% if panel.has_content and panel.enabled %}
-  <div id="{{ panel.panel_id }}" class="djdt-panelContent djdt-hidden">
+  <div id="{{ panel.panel_id }}" class="djdt-panelContent djdt-hidden" role="region" aria-labelledby="djdt-{{ panel.panel_id }}-title">
     <div class="djDebugPanelTitle">
-      <button type="button" class="djDebugClose">×</button>
+      <button type="button" class="djDebugClose" aria-label="{% trans "Close" %}">×</button>
       <h3>{{ panel.title }}</h3>
     </div>
     <div class="djDebugPanelContent">
       {% if toolbar.should_render_panels %}
         {% for script in panel.scripts %}<script type="module" src="{{ script }}" async></script>{% endfor %}
-        <div class="djdt-scroll">{{ panel.content }}</div>
+        <div class="djdt-scroll" aria-live="polite" aria-atomic="true">{{ panel.content }}</div>
       {% else %}
-        <div class="djdt-loader"></div>
-        <div class="djdt-scroll"></div>
+        <div class="djdt-loader" role="alert" aria-busy="true"></div>
+        <div class="djdt-scroll" aria-live="polite" aria-atomic="true"></div>
       {% endif %}
     </div>
   </div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/cache.html b/debug_toolbar/templates/debug_toolbar/panels/cache.html
index 0e1ec2a4c..6b87a996b 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/cache.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/cache.html
@@ -1,6 +1,6 @@
 {% load i18n %}
-<h4>{% trans "Summary" %}</h4>
-<table>
+<h4 id="summary-heading">{% trans "Summary" %}</h4>
+<table aria-labelledby="summary-heading">
   <thead>
     <tr>
       <th>{% trans "Total calls" %}</th>
@@ -18,8 +18,8 @@ <h4>{% trans "Summary" %}</h4>
     </tr>
   </tbody>
 </table>
-<h4>{% trans "Commands" %}</h4>
-<table>
+<h4 id="commands-heading">{% trans "Commands" %}</h4>
+<table aria-labelledby="commands-heading">
   <thead>
     <tr>
       {% for name in counts.keys %}
@@ -36,8 +36,8 @@ <h4>{% trans "Commands" %}</h4>
   </tbody>
 </table>
 {% if calls %}
-  <h4>{% trans "Calls" %}</h4>
-  <table>
+  <h4 id="calls-heading">{% trans "Calls" %}</h4>
+  <table aria-labelledby="calls-heading">
     <thead>
       <tr>
         <th colspan="2">{% trans "Time (ms)" %}</th>
@@ -59,7 +59,7 @@ <h4>{% trans "Calls" %}</h4>
           <td>{{ call.kwargs|escape }}</td>
           <td>{{ call.backend }}</td>
         </tr>
-        <tr class="djUnselected djToggleDetails_{{ forloop.counter }}" id="cacheDetails_{{ forloop.counter }}">
+        <tr class="djUnselected djToggleDetails_{{ forloop.counter }}" id="cacheDetails_{{ forloop.counter }}" aria-hidden="true">
           <td colspan="1"></td>
           <td colspan="5"><pre class="djdt-stack">{{ call.trace }}</pre></td>
         </tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index f4146e8dd..e171df229 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -1,8 +1,8 @@
 {% load i18n %}
 
-<h4>{% trans "Request headers" %}</h4>
+<h4 id="request-headers">{% trans "Request headers" %}</h4>
 
-<table>
+<table aria-labelledby="request-headers">
   <thead>
     <tr>
       <th>{% trans "Key" %}</th>
@@ -19,9 +19,9 @@ <h4>{% trans "Request headers" %}</h4>
   </tbody>
 </table>
 
-<h4>{% trans "Response headers" %}</h4>
+<h4 id="response-headers">{% trans "Response headers" %}</h4>
 
-<table>
+<table aria-labelledby="response-headers">
   <thead>
     <tr>
       <th>{% trans "Key" %}</th>
@@ -38,11 +38,11 @@ <h4>{% trans "Response headers" %}</h4>
   </tbody>
 </table>
 
-<h4>{% trans "WSGI environ" %}</h4>
+<h4 id="wsgi-environ">{% trans "WSGI environ" %}</h4>
 
 <p>{% trans "Since the WSGI environ inherits the environment of the server, only a significant subset is shown below." %}</p>
 
-<table>
+<table aria-labelledby="wsgi-environ">
   <thead>
     <tr>
       <th>{% trans "Key" %}</th>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/history.html b/debug_toolbar/templates/debug_toolbar/panels/history.html
index 84c6cb5bd..b8ec185de 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/history.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/history.html
@@ -1,20 +1,20 @@
-{% load i18n %}{% load static %}
+{% load i18n static %}
 <form method="get" action="{% url 'djdt:history_refresh' %}">
     {{ refresh_form }}
-    <button class="refreshHistory">Refresh</button>
+    <button class="refreshHistory">{% trans "Refresh" %}</button>
 </form>
-<table class="djdt-max-height-100">
+<table class="djdt-max-height-100" role="grid" aria-labelledby="history-table-heading">
     <thead>
-        <tr>
-            <th>{% trans "Time" %}</th>
-            <th>{% trans "Method" %}</th>
-            <th>{% trans "Path" %}</th>
-            <th>{% trans "Request Variables" %}</th>
-            <th>{% trans "Status" %}</th>
-            <th>{% trans "Action" %}</th>
+        <tr role="row">
+            <th role="columnheader">{% trans "Time" %}</th>
+            <th role="columnheader">{% trans "Method" %}</th>
+            <th role="columnheader">{% trans "Path" %}</th>
+            <th role="columnheader">{% trans "Request Variables" %}</th>
+            <th role="columnheader">{% trans "Status" %}</th>
+            <th role="columnheader">{% trans "Action" %}</th>
         </tr>
     </thead>
-    <tbody id="djdtHistoryRequests">
+    <tbody id="djdtHistoryRequests" role="rowgroup">
         {% for id, store_context in stores.items %}
             {% include "debug_toolbar/panels/history_tr.html" %}
         {% endfor %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/history_tr.html b/debug_toolbar/templates/debug_toolbar/panels/history_tr.html
index 31793472a..12e93622c 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/history_tr.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/history_tr.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<tr class="{% if id == current_store_id %}djdt-highlighted{% endif %}" id="historyMain_{{ id }}" data-store-id="{{ id }}">
+<tr class="{% if id == current_store_id %}djdt-highlighted{% endif %}" id="historyMain_{{ id }}" data-store-id="{{ id }}" role="row">
     <td>
         {{ store_context.toolbar.stats.HistoryPanel.time|escape }}
     </td>
@@ -10,9 +10,9 @@
         <p>{{ store_context.toolbar.stats.HistoryPanel.request_url|truncatechars:100|escape }}</p>
     </td>
     <td>
-        <button type="button" class="djToggleSwitch" data-toggle-name="historyMain" data-toggle-id="{{ id }}">+</button>
-        <div class="djUnselected djToggleDetails_{{ id }}">
-          <table>
+        <button type="button" class="djToggleSwitch" data-toggle-name="historyMain" data-toggle-id="{{ id }}" aria-expanded="false" aria-controls="historyDetails_{{ id }}">+</button>
+        <div class="djUnselected djToggleDetails_{{ id }}" id="historyDetails_{{ id }}" aria-hidden="true">
+          <table aria-labelledby="historyMain_{{ id }}">
             <colgroup>
               <col class="djdt-width-20">
               <col>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/profiling.html b/debug_toolbar/templates/debug_toolbar/panels/profiling.html
index 4c1c3acd3..a1035fb6f 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/profiling.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/profiling.html
@@ -1,22 +1,22 @@
 {% load i18n %}
-<table>
+<table role="grid" aria-labelledby="profiling-table-heading">
   <thead>
-    <tr>
-      <th>{% trans "Call" %}</th>
-      <th>{% trans "CumTime" %}</th>
-      <th>{% trans "Per" %}</th>
-      <th>{% trans "TotTime" %}</th>
-      <th>{% trans "Per" %}</th>
-      <th>{% trans "Count" %}</th>
+    <tr role="row">
+      <th role="columnheader">{% trans "Call" %}</th>
+      <th role="columnheader">{% trans "CumTime" %}</th>
+      <th role="columnheader">{% trans "Per" %}</th>
+      <th role="columnheader">{% trans "TotTime" %}</th>
+      <th role="columnheader">{% trans "Per" %}</th>
+      <th role="columnheader">{% trans "Count" %}</th>
     </tr>
   </thead>
-  <tbody>
+  <tbody role="rowgroup">
     {% for call in func_list %}
-      <tr class="djdt-profile-row {% if call.is_project_func %}djdt-highlighted {% endif %} {% for parent_id in call.parent_ids %} djToggleDetails_{{ parent_id }}{% endfor %}" id="profilingMain_{{ call.id }}">
+      <tr role="row" class="djdt-profile-row {% if call.is_project_func %}djdt-highlighted {% endif %} {% for parent_id in call.parent_ids %} djToggleDetails_{{ parent_id }}{% endfor %}" id="profilingMain_{{ call.id }}">
         <td>
           <div data-djdt-styles="paddingLeft:{{ call.indent }}px">
             {% if call.has_subfuncs %}
-              <button type="button" class="djProfileToggleDetails djToggleSwitch" data-toggle-name="profilingMain" data-toggle-id="{{ call.id }}">-</button>
+              <button type="button" class="djProfileToggleDetails djToggleSwitch" data-toggle-name="profilingMain" data-toggle-id="{{ call.id }}" aria-expanded="false" aria-controls="profilingDetails_{{ call.id }}">-</button>
             {% else %}
               <span class="djNoToggleSwitch"></span>
             {% endif %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request.html b/debug_toolbar/templates/debug_toolbar/panels/request.html
index 076d5f74f..2cc882bc1 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request.html
@@ -1,17 +1,17 @@
 {% load i18n %}
 
-<h4>{% trans "View information" %}</h4>
-<table>
+<h4 id="view-info-heading">{% trans "View information" %}</h4>
+<table role="table" aria-labelledby="view-info-heading">
   <thead>
-    <tr>
-      <th>{% trans "View function" %}</th>
-      <th>{% trans "Arguments" %}</th>
-      <th>{% trans "Keyword arguments" %}</th>
-      <th>{% trans "URL name" %}</th>
+    <tr role="row">
+      <th role="columnheader">{% trans "View function" %}</th>
+      <th role="columnheader">{% trans "Arguments" %}</th>
+      <th role="columnheader">{% trans "Keyword arguments" %}</th>
+      <th role="columnheader">{% trans "URL name" %}</th>
     </tr>
   </thead>
-  <tbody>
-    <tr>
+  <tbody role="rowgroup">
+    <tr role="row">
       <td><code>{{ view_func }}</code></td>
       <td><code>{{ view_args|pprint }}</code></td>
       <td><code>{{ view_kwargs|pprint }}</code></td>
@@ -21,28 +21,28 @@ <h4>{% trans "View information" %}</h4>
 </table>
 
 {% if cookies.list or cookies.raw %}
-  <h4>{% trans "Cookies" %}</h4>
+  <h4 id="cookies-heading">{% trans "Cookies" %}</h4>
   {% include 'debug_toolbar/panels/request_variables.html' with variables=cookies %}
 {% else %}
   <h4>{% trans "No cookies" %}</h4>
 {% endif %}
 
 {% if session.list or session.raw %}
-  <h4>{% trans "Session data" %}</h4>
+  <h4 id="session-heading">{% trans "Session data" %}</h4>
   {% include 'debug_toolbar/panels/request_variables.html' with variables=session %}
 {% else %}
   <h4>{% trans "No session data" %}</h4>
 {% endif %}
 
 {% if get.list or get.raw %}
-  <h4>{% trans "GET data" %}</h4>
+  <h4 id="get-heading">{% trans "GET data" %}</h4>
   {% include 'debug_toolbar/panels/request_variables.html' with variables=get %}
 {% else %}
   <h4>{% trans "No GET data" %}</h4>
 {% endif %}
 
 {% if post.list or post.raw %}
-  <h4>{% trans "POST data" %}</h4>
+  <h4 id="post-heading">{% trans "POST data" %}</h4>
   {% include 'debug_toolbar/panels/request_variables.html' with variables=post %}
 {% else %}
   <h4>{% trans "No POST data" %}</h4>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_variables.html b/debug_toolbar/templates/debug_toolbar/panels/request_variables.html
index 92200f867..cff37715b 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_variables.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_variables.html
@@ -1,20 +1,20 @@
 {% load i18n %}
 
 {% if variables.list %}
-<table>
+<table role="table" aria-labelledby="request-variables-table-heading">
   <colgroup>
     <col class="djdt-width-20">
     <col>
   </colgroup>
   <thead>
-    <tr>
-      <th>{% trans "Variable" %}</th>
-      <th>{% trans "Value" %}</th>
+    <tr role="row">
+      <th role="columnheader">{% trans "Variable" %}</th>
+      <th role="columnheader">{% trans "Value" %}</th>
     </tr>
   </thead>
-  <tbody>
+  <tbody role="rowgroup">
     {% for key, value in variables.list %}
-      <tr>
+      <tr role="row">
         <td><code>{{ key|pprint }}</code></td>
         <td><code>{{ value|pprint }}</code></td>
       </tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings.html b/debug_toolbar/templates/debug_toolbar/panels/settings.html
index 14763e4e6..ccffb7fd9 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings.html
@@ -1,14 +1,15 @@
 {% load i18n %}
-<table>
-  <thead>
-    <tr>
-      <th>{% trans "Setting" %}</th>
-      <th>{% trans "Value" %}</th>
+
+<table role="table" aria-labelledby="settings-heading">
+  <thead role="rowgroup">
+    <tr role="row">
+      <th role="columnheader">{% trans "Setting" %}</th>
+      <th role="columnheader">{% trans "Value" %}</th>
     </tr>
   </thead>
-  <tbody>
+  <tbody role="rowgroup">
     {% for name, value in settings.items %}
-      <tr>
+      <tr role="row">
         <td>{{ name }}</td>
         <td><code>{{ value|pprint }}</code></td>
       </tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
index cd9f42c4a..c23af24d6 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -1,14 +1,15 @@
 {% load i18n %}
-<table>
-  <thead>
-    <tr>
-      <th>{% trans "Signal" %}</th>
-      <th>{% trans "Receivers" %}</th>
+
+<table role="table" aria-labelledby="signals-heading">
+  <thead role="rowgroup">
+    <tr role="row">
+      <th role="columnheader">{% trans "Signal" %}</th>
+      <th role="columnheader">{% trans "Receivers" %}</th>
     </tr>
   </thead>
-  <tbody>
+  <tbody role="rowgroup">
     {% for name, receivers in signals %}
-      <tr>
+      <tr role="row">
         <td>{{ name|escape }}</td>
         <td>{{ receivers|join:", " }}</td>
       </tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index 6080e9f19..255c2289e 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -1,7 +1,8 @@
 {% load i18n l10n %}
-<ul>
+
+<ul role="list">
   {% for alias, info in databases %}
-    <li>
+    <li role="listitem">
       <strong><span class="djdt-color" data-djdt-styles="backgroundColor:rgb({{ info.rgb_color|join:', ' }})"></span> {{ alias }}</strong>
       {{ info.time_spent|floatformat:"2" }} ms ({% blocktrans count info.num_queries as num %}{{ num }} query{% plural %}{{ num }} queries{% endblocktrans %}
       {% if info.similar_count %}
@@ -19,7 +20,7 @@
 </ul>
 
 {% if queries %}
-  <table>
+  <table role="table">
     <colgroup>
       <col>
       <col>
@@ -28,39 +29,39 @@
       <col>
       <col>
     </colgroup>
-    <thead>
-      <tr>
-        <th></th>
-        <th colspan="2">{% trans "Query" %}</th>
-        <th>{% trans "Timeline" %}</th>
-        <th>{% trans "Time (ms)" %}</th>
-        <th>{% trans "Action" %}</th>
+    <thead role="rowgroup">
+      <tr role="row">
+        <th role="columnheader"></th>
+        <th role="columnheader" colspan="2">{% trans "Query" %}</th>
+        <th role="columnheader">{% trans "Timeline" %}</th>
+        <th role="columnheader">{% trans "Time (ms)" %}</th>
+        <th role="columnheader">{% trans "Action" %}</th>
       </tr>
     </thead>
-    <tbody>
+    <tbody role="rowgroup">
       {% for query in queries %}
-        <tr class="{% if query.is_slow %} djDebugRowWarning{% endif %}" id="sqlMain_{{ forloop.counter }}">
-          <td><span class="djdt-color" data-djdt-styles="backgroundColor:rgb({{ query.rgb_color|join:', '}})"></span></td>
-          <td class="djdt-toggle">
+        <tr role="row" class="{% if query.is_slow %} djDebugRowWarning{% endif %}" id="sqlMain_{{ forloop.counter }}">
+          <td role="cell"><span class="djdt-color" data-djdt-styles="backgroundColor:rgb({{ query.rgb_color|join:', '}})"></span></td>
+          <td role="cell" class="djdt-toggle">
             <button type="button" class="djToggleSwitch" data-toggle-name="sqlMain" data-toggle-id="{{ forloop.counter }}">+</button>
           </td>
-          <td>
+          <td role="cell">
             <div class="djDebugSql">{{ query.sql|safe }}</div>
             {% if query.similar_count %}
-              <strong>
+              <strong role="status">
                 <span class="djdt-color" data-djdt-styles="backgroundColor:{{ query.similar_color }}"></span>
                 {% blocktrans with count=query.similar_count %}{{ count }} similar queries.{% endblocktrans %}
               </strong>
             {% endif %}
             {% if query.duplicate_count %}
-              <strong>
+              <strong role="status">
                 <span class="djdt-color" data-djdt-styles="backgroundColor:{{ query.duplicate_color }}"></span>
                 {% blocktrans with dupes=query.duplicate_count %}Duplicated {{ dupes }} times.{% endblocktrans %}
               </strong>
             {% endif %}
           </td>
-          <td>
-            <svg class="djDebugLineChart{% if query.is_slow %} djDebugLineChartWarning{% endif %}{% if query.in_trans %} djDebugLineChartInTransaction{% endif %}" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 100 5" preserveAspectRatio="none" aria-label="{{ query.width_ratio }}%">
+          <td role="cell">
+            <svg role="img" class="djDebugLineChart{% if query.is_slow %} djDebugLineChartWarning{% endif %}{% if query.in_trans %} djDebugLineChartInTransaction{% endif %}" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 100 5" preserveAspectRatio="none" aria-label="{{ query.width_ratio }}%">
               <rect x="{{ query.start_offset|unlocalize }}" y="0" height="5" width="{{ query.width_ratio|unlocalize }}" fill="{{ query.trace_color }}" />
               {% if query.starts_trans %}
                 <line x1="{{ query.start_offset|unlocalize }}" y1="0" x2="{{ query.start_offset|unlocalize }}" y2="5" />
@@ -70,10 +71,10 @@
               {% endif %}
             </svg>
           </td>
-          <td class="djdt-time">
+          <td role="cell" class="djdt-time">
             {{ query.duration|floatformat:"2" }}
           </td>
-          <td class="djdt-actions">
+          <td role="cell" class="djdt-actions">
             {% if query.params %}
               {% if query.is_select %}
                 <form method="post">
@@ -88,9 +89,9 @@
             {% endif %}
           </td>
         </tr>
-        <tr class="djUnselected {% if query.is_slow %} djDebugRowWarning{% endif %} djToggleDetails_{{ forloop.counter }}" id="sqlDetails_{{ forloop.counter }}">
-          <td colspan="2"></td>
-          <td colspan="4">
+        <tr role="row" class="djUnselected {% if query.is_slow %} djDebugRowWarning{% endif %} djToggleDetails_{{ forloop.counter }}" id="sqlDetails_{{ forloop.counter }}">
+          <td role="cell" colspan="2"></td>
+          <td role="cell" colspan="4">
             <div class="djSQLDetailsDiv">
               <p><strong>{% trans "Connection:" %}</strong> {{ query.alias }}</p>
               {% if query.iso_level %}
@@ -100,18 +101,18 @@
                 <p><strong>{% trans "Transaction status:" %}</strong> {{ query.trans_status }}</p>
               {% endif %}
               {% if query.stacktrace %}
-                <pre class="djdt-stack">{{ query.stacktrace }}</pre>
+                <pre role="status" class="djdt-stack">{{ query.stacktrace }}</pre>
               {% endif %}
               {% if query.template_info %}
                 <table>
                   {% for line in query.template_info.context %}
-                    <tr>
-                      <td>{{ line.num }}</td>
-                      <td><code {% if line.highlight %}class="djdt-highlighted"{% endif %}>{{ line.content }}</code></td>
+                    <tr role="row">
+                      <td role="cell">{{ line.num }}</td>
+                      <td role="cell"><code {% if line.highlight %}class="djdt-highlighted"{% endif %}>{{ line.content }}</code></td>
                     </tr>
                   {% endfor %}
                 </table>
-                <p><strong>{{ query.template_info.name|default:_("(unknown)") }}</strong></p>
+                <p role="status"><strong>{{ query.template_info.name|default:_("(unknown)") }}</strong></p>
               {% endif %}
             </div>
           </td>
@@ -120,5 +121,5 @@
     </tbody>
   </table>
 {% else %}
-  <p>{% trans "No SQL queries were recorded during this request." %}</p>
+  <p role="status">{% trans "No SQL queries were recorded during this request." %}</p>
 {% endif %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
index 61dadbda6..15cf74c2f 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
@@ -1,31 +1,32 @@
 {% load i18n %}
-<div class="djDebugPanelTitle">
+
+<div class="djDebugPanelTitle" role="heading" aria-level="2">
   <button type="button" class="djDebugClose">»</button>
   <h3>{% trans "SQL explained" %}</h3>
 </div>
 <div class="djDebugPanelContent">
   <div class="djdt-scroll">
-    <dl>
-      <dt>{% trans "Executed SQL" %}</dt>
-      <dd>{{ sql|safe }}</dd>
-      <dt>{% trans "Time" %}</dt>
-      <dd>{{ duration }} ms</dd>
-      <dt>{% trans "Database" %}</dt>
-      <dd>{{ alias }}</dd>
+    <dl role="list">
+      <dt role="listitem">{% trans "Executed SQL" %}</dt>
+      <dd role="listitem">{{ sql|safe }}</dd>
+      <dt role="listitem">{% trans "Time" %}</dt>
+      <dd role="listitem">{{ duration }} ms</dd>
+      <dt role="listitem">{% trans "Database" %}</dt>
+      <dd role="listitem">{{ alias }}</dd>
     </dl>
-    <table>
-      <thead>
-        <tr>
+    <table role="table">
+      <thead role="rowgroup">
+        <tr role="row">
           {% for h in headers %}
-            <th>{{ h|upper }}</th>
+            <th role="columnheader">{{ h|upper }}</th>
           {% endfor %}
         </tr>
       </thead>
-      <tbody>
+      <tbody role="rowgroup">
         {% for row in result %}
-          <tr>
+          <tr role="row">
             {% for column in row %}
-              <td>{% if forloop.last %}<code>{% endif %}{{ column|escape }}{% if forloop.last %}</code>{% endif %}</td>
+              <td role="cell">{% if forloop.last %}<code>{% endif %}{{ column|escape }}{% if forloop.last %}</code>{% endif %}</td>
             {% endfor %}
           </tr>
         {% endfor %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
index 57f20b619..386f0855c 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
@@ -1,41 +1,42 @@
 {% load i18n %}
-<div class="djDebugPanelTitle">
+
+<div class="djDebugPanelTitle" role="heading" aria-level="2">
   <button type="button" class="djDebugClose">»</button>
   <h3>{% trans "SQL profiled" %}</h3>
 </div>
 <div class="djDebugPanelContent">
   <div class="djdt-scroll">
     {% if result %}
-      <dl>
-        <dt>{% trans "Executed SQL" %}</dt>
-        <dd>{{ sql|safe }}</dd>
-        <dt>{% trans "Time" %}</dt>
-        <dd>{{ duration }} ms</dd>
-        <dt>{% trans "Database" %}</dt>
-        <dd>{{ alias }}</dd>
+      <dl role="list">
+        <dt role="listitem">{% trans "Executed SQL" %}</dt>
+        <dd role="listitem">{{ sql|safe }}</dd>
+        <dt role="listitem">{% trans "Time" %}</dt>
+        <dd role="listitem">{{ duration }} ms</dd>
+        <dt role="listitem">{% trans "Database" %}</dt>
+        <dd role="listitem">{{ alias }}</dd>
       </dl>
-      <table>
-        <thead>
-          <tr>
+      <table role="table">
+        <thead role="rowgroup">
+          <tr role="row">
             {% for h in headers %}
-              <th>{{ h|upper }}</th>
+              <th role="columnheader">{{ h|upper }}</th>
             {% endfor %}
           </tr>
         </thead>
-        <tbody>
+        <tbody role="rowgroup">
           {% for row in result %}
-            <tr>
+            <tr role="row">
               {% for column in row %}
-                <td>{{ column|escape }}</td>
+                <td role="cell">{{ column|escape }}</td>
               {% endfor %}
             </tr>
           {% endfor %}
         </tbody>
       </table>
     {% else %}
-      <dl>
-        <dt>{% trans "Error" %}</dt>
-        <dd>{{ result_error }}</dd>
+      <dl role="list">
+        <dt role="listitem">{% trans "Error" %}</dt>
+        <dd role="listitem">{{ result_error }}</dd>
       </dl>
     {% endif %}
   </div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
index 699c18d87..ebb27a612 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
@@ -1,39 +1,40 @@
 {% load i18n %}
-<div class="djDebugPanelTitle">
+
+<div class="djDebugPanelTitle" role="heading" aria-level="2">
   <button type="button" class="djDebugClose">»</button>
   <h3>{% trans "SQL selected" %}</h3>
 </div>
 <div class="djDebugPanelContent">
   <div class="djdt-scroll">
-    <dl>
-      <dt>{% trans "Executed SQL" %}</dt>
-      <dd>{{ sql|safe }}</dd>
-      <dt>{% trans "Time" %}</dt>
-      <dd>{{ duration }} ms</dd>
-      <dt>{% trans "Database" %}</dt>
-      <dd>{{ alias }}</dd>
+    <dl role="list">
+      <dt role="listitem">{% trans "Executed SQL" %}</dt>
+      <dd role="listitem">{{ sql|safe }}</dd>
+      <dt role="listitem">{% trans "Time" %}</dt>
+      <dd role="listitem">{{ duration }} ms</dd>
+      <dt role="listitem">{% trans "Database" %}</dt>
+      <dd role="listitem">{{ alias }}</dd>
     </dl>
     {% if result %}
-      <table>
-        <thead>
-          <tr>
+      <table role="table">
+        <thead role="rowgroup">
+          <tr role="row">
             {% for h in headers %}
-              <th>{{ h|upper }}</th>
+              <th role="columnheader">{{ h|upper }}</th>
             {% endfor %}
           </tr>
         </thead>
-        <tbody>
+        <tbody role="rowgroup">
           {% for row in result %}
-            <tr>
+            <tr role="row">
               {% for column in row %}
-                <td>{{ column|escape }}</td>
+                <td role="cell">{{ column|escape }}</td>
               {% endfor %}
             </tr>
           {% endfor %}
         </tbody>
       </table>
     {% else %}
-      <p>{% trans "Empty set" %}</p>
+      <p role="status">{% trans "Empty set" %}</p>
     {% endif %}
   </div>
 </div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/staticfiles.html b/debug_toolbar/templates/debug_toolbar/panels/staticfiles.html
index 9aa519f67..d70e3808d 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/staticfiles.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/staticfiles.html
@@ -1,54 +1,53 @@
 {% load i18n %}
 
-<h4>{% blocktrans count staticfiles_dirs|length as dirs_count %}Static file path{% plural %}Static file paths{% endblocktrans %}</h4>
+<h4 role="heading" aria-level="2">{% blocktrans count staticfiles_dirs|length as dirs_count %}Static file path{% plural %}Static file paths{% endblocktrans %}</h4>
 {% if staticfiles_dirs %}
-  <ol>
+  <ol role="list">
     {% for prefix, staticfiles_dir in staticfiles_dirs %}
-      <li>{{ staticfiles_dir }}{% if prefix %} {% blocktrans %}(prefix {{ prefix }}){% endblocktrans %}{% endif %}</li>
+      <li role="listitem">{{ staticfiles_dir }}{% if prefix %} {% blocktrans %}(prefix {{ prefix }}){% endblocktrans %}{% endif %}</li>
     {% endfor %}
   </ol>
 {% else %}
-  <p>{% trans "None" %}</p>
+  <p role="status">{% trans "None" %}</p>
 {% endif %}
 
-<h4>{% blocktrans count staticfiles_apps|length as apps_count %}Static file app{% plural %}Static file apps{% endblocktrans %}</h4>
+<h4 role="heading" aria-level="2">{% blocktrans count staticfiles_apps|length as apps_count %}Static file app{% plural %}Static file apps{% endblocktrans %}</h4>
 {% if staticfiles_apps %}
-  <ol>
+  <ol role="list">
     {% for static_app in staticfiles_apps %}
-      <li>{{ static_app }}</li>
+      <li role="listitem">{{ static_app }}</li>
     {% endfor %}
   </ol>
 {% else %}
-  <p>{% trans "None" %}</p>
+  <p role="status">{% trans "None" %}</p>
 {% endif %}
 
-<h4>{% blocktrans count staticfiles|length as staticfiles_count %}Static file{% plural %}Static files{% endblocktrans %}</h4>
+<h4 role="heading" aria-level="2">{% blocktrans count staticfiles|length as staticfiles_count %}Static file{% plural %}Static files{% endblocktrans %}</h4>
 {% if staticfiles %}
-  <dl>
+  <dl role="list">
     {% for staticfile in staticfiles %}
-      <dt><strong><a class="toggleTemplate" href="{{ staticfile.url }}">{{ staticfile }}</a></strong></dt>
-      <dd><samp>{{ staticfile.real_path }}</samp></dd>
+      <dt role="listitem"><strong><a class="toggleTemplate" href="{{ staticfile.url }}">{{ staticfile }}</a></strong></dt>
+      <dd role="listitem"><samp>{{ staticfile.real_path }}</samp></dd>
     {% endfor %}
   </dl>
 {% else %}
-  <p>{% trans "None" %}</p>
+  <p role="status">{% trans "None" %}</p>
 {% endif %}
 
-
 {% for finder, payload in staticfiles_finders.items %}
-  <h4>{{ finder }} ({% blocktrans count payload|length as payload_count %}{{ payload_count }} file{% plural %}{{ payload_count }} files{% endblocktrans %})</h4>
-  <table>
-    <thead>
-      <tr>
-        <th>{% trans 'Path' %}</th>
-        <th>{% trans 'Location' %}</th>
+  <h4 role="heading" aria-level="2">{{ finder }} ({% blocktrans count payload|length as payload_count %}{{ payload_count }} file{% plural %}{{ payload_count }} files{% endblocktrans %})</h4>
+  <table role="table">
+    <thead role="rowgroup">
+      <tr role="row">
+        <th role="columnheader">{% trans 'Path' %}</th>
+        <th role="columnheader">{% trans 'Location' %}</th>
       </tr>
     </thead>
-    <tbody>
+    <tbody role="rowgroup">
       {% for path, real_path in payload %}
-        <tr>
-          <td>{{ path }}</td>
-          <td>{{ real_path }}</td>
+        <tr role="row">
+          <td role="cell">{{ path }}</td>
+          <td role="cell">{{ real_path }}</td>
         </tr>
       {% endfor %}
     </tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
index 397c44b24..f2b061cf9 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
@@ -1,10 +1,10 @@
 {% load i18n %}
 <div class="djDebugPanelTitle">
   <button type="button" class="djDebugClose">»</button>
-  <h3>{% trans "Template source:" %} <code>{{ template_name }}</code></h3>
+  <h3 role="heading" aria-level="2">{% trans "Template source:" %} <code>{{ template_name }}</code></h3>
 </div>
 <div class="djDebugPanelContent">
-  <div class="djdt-scroll">
+  <div class="djdt-scroll" role="document" aria-labelledby="template-source-heading">
     {{ source }}
   </div>
 </div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index 121c086a8..511716267 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<h4>{% blocktrans count template_dirs|length as template_count %}Template path{% plural %}Template paths{% endblocktrans %}</h4>
+<h4 role="heading" aria-level="2">{% blocktrans count template_dirs|length as template_count %}Template path{% plural %}Template paths{% endblocktrans %}</h4>
 {% if template_dirs %}
   <ol>
     {% for template in template_dirs %}
@@ -10,14 +10,14 @@ <h4>{% blocktrans count template_dirs|length as template_count %}Template path{%
   <p>{% trans "None" %}</p>
 {% endif %}
 
-<h4>{% blocktrans count templates|length as template_count %}Template{% plural %}Templates{% endblocktrans %}</h4>
+<h4 role="heading" aria-level="2">{% blocktrans count templates|length as template_count %}Template{% plural %}Templates{% endblocktrans %}</h4>
 {% if templates %}
   <dl>
     {% for template in templates %}
-      <dt><strong><a class="remoteCall toggleTemplate" href="{% url 'djdt:template_source' %}?template={{ template.template.name }}&amp;template_origin={{ template.template.origin_hash }}">{{ template.template.name|addslashes }}</a></strong></dt>
+      <dt role="heading" aria-level="3"><strong><a class="remoteCall toggleTemplate" href="{% url 'djdt:template_source' %}?template={{ template.template.name }}&amp;template_origin={{ template.template.origin_hash }}">{{ template.template.name|addslashes }}</a></strong></dt>
       <dd><samp>{{ template.template.origin_name|addslashes }}</samp></dd>
       {% if template.context %}
-        <dd>
+        <dd role="group">
           <details>
             <summary>{% trans "Toggle context" %}</summary>
             <code class="djTemplateContext">{{ template.context }}</code>
@@ -30,12 +30,12 @@ <h4>{% blocktrans count templates|length as template_count %}Template{% plural %
   <p>{% trans "None" %}</p>
 {% endif %}
 
-<h4>{% blocktrans count context_processors|length as context_processors_count %}Context processor{% plural %}Context processors{% endblocktrans %}</h4>
+<h4 role="heading" aria-level="2">{% blocktrans count context_processors|length as context_processors_count %}Context processor{% plural %}Context processors{% endblocktrans %}</h4>
 {% if context_processors %}
   <dl>
     {% for key, value in context_processors.items %}
-      <dt><strong>{{ key|escape }}</strong></dt>
-      <dd>
+      <dt role="heading" aria-level="3"><strong>{{ key|escape }}</strong></dt>
+      <dd role="group">
         <details>
           <summary>{% trans "Toggle context" %}</summary>
           <code class="djTemplateContext">{{ value|escape }}</code>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index 11483c107..3456d5e82 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<h4>{% trans "Resource usage" %}</h4>
+<h4 role="heading" aria-level="2">{% trans "Resource usage" %}</h4>
 <table>
   <colgroup>
     <col class="djdt-width-20">
@@ -22,8 +22,8 @@ <h4>{% trans "Resource usage" %}</h4>
 </table>
 
 <!-- This hidden div is populated and displayed by code in toolbar.timer.js -->
-<div id="djDebugBrowserTiming" class="djdt-hidden">
-  <h4>{% trans "Browser timing" %}</h4>
+<div id="djDebugBrowserTiming" class="djdt-hidden" role="group" aria-labelledby="djDebugBrowserTimingTitle">
+  <h4 id="djDebugBrowserTimingTitle">{% trans "Browser timing" %}</h4>
   <table>
     <colgroup>
       <col class="djdt-width-20">
diff --git a/debug_toolbar/templates/debug_toolbar/panels/versions.html b/debug_toolbar/templates/debug_toolbar/panels/versions.html
index d0ade6cfb..452f3c481 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/versions.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/versions.html
@@ -1,23 +1,23 @@
 {% load i18n %}
-<table>
+<table role="table" aria-label="{% trans "Package versions" %}">
   <colgroup>
     <col class="djdt-width-20">
     <col class="djdt-width-20">
     <col>
   </colgroup>
   <thead>
-    <tr>
-      <th>{% trans "Package" %}</th>
-      <th>{% trans "Name" %}</th>
-      <th>{% trans "Version" %}</th>
+    <tr role="row">
+      <th role="columnheader">{% trans "Package" %}</th>
+      <th role="columnheader">{% trans "Name" %}</th>
+      <th role="columnheader">{% trans "Version" %}</th>
     </tr>
   </thead>
   <tbody>
     {% for package, name, version in versions %}
-      <tr>
-        <td>{{ package }}</td>
-        <td>{{ name }}</td>
-        <td>{{ version }}</td>
+      <tr role="row">
+        <td role="gridcell">{{ package }}</td>
+        <td role="gridcell">{{ name }}</td>
+        <td role="gridcell">{{ version }}</td>
       </tr>
     {% endfor %}
   </tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html
index 96b97de2d..cb5eb1f64 100644
--- a/debug_toolbar/templates/debug_toolbar/redirect.html
+++ b/debug_toolbar/templates/debug_toolbar/redirect.html
@@ -5,9 +5,9 @@
     <title>Django Debug Toolbar Redirects Panel: {{ status_line }}</title>
     <script type="module" src="{% static 'debug_toolbar/js/redirect.js' %}" async></script>
   </head>
-  <body>
+  <body aria-live="polite" role="status">
     <h1>{{ status_line }}</h1>
-    <h2>{% trans "Location:" %} <a id="redirect_to" href="{{ redirect_to }}">{{ redirect_to }}</a></h2>
+    <h2>{% trans "Location:" %} <a id="redirect_to" href="{{ redirect_to }}" role="link">{{ redirect_to }}</a></h2>
     <p class="notice">
       {% trans "The Django Debug Toolbar has intercepted a redirect to the above URL for debug viewing purposes. You can click the above link to continue with the redirect as normal." %}
     </p>
diff --git a/tests/panels/test_custom.py b/tests/panels/test_custom.py
index f13c4ef62..d22ff5b95 100644
--- a/tests/panels/test_custom.py
+++ b/tests/panels/test_custom.py
@@ -19,9 +19,9 @@ def test_escapes_panel_title(self):
         self.assertContains(
             response,
             """
-            <li id="djdt-CustomPanel" class="djDebugPanelButton">
-            <input type="checkbox" checked title="Disable for next and successive requests" data-cookie="djdtCustomPanel">
-            <a class="CustomPanel" href="#" title="Title with special chars &amp;&quot;&#39;&lt;&gt;">
+            <li id="djdt-CustomPanel" class="djDebugPanelButton" role="checkbox">
+            <input type="checkbox" checked title="Disable for next and successive requests" data-cookie="djdtCustomPanel" aria-label="Disable for next and successive requests">
+            <a class="CustomPanel" href="#" title="Title with special chars &amp;&quot;&#39;&lt;&gt;" role="link">
             Title with special chars &amp;&quot;&#39;&lt;&gt;
             </a>
             </li>
@@ -31,14 +31,14 @@ def test_escapes_panel_title(self):
         self.assertContains(
             response,
             """
-            <div id="CustomPanel" class="djdt-panelContent djdt-hidden">
+            <div id="CustomPanel" class="djdt-panelContent djdt-hidden" role="region" aria-labelledby="djdt-CustomPanel-title">
             <div class="djDebugPanelTitle">
-            <button type="button" class="djDebugClose">×</button>
+            <button type="button" class="djDebugClose" aria-label="Close">×</button>
             <h3>Title with special chars &amp;&quot;&#39;&lt;&gt;</h3>
             </div>
             <div class="djDebugPanelContent">
-            <div class="djdt-loader"></div>
-            <div class="djdt-scroll"></div>
+            <div class="djdt-loader" role="alert" aria-busy="true"></div>
+            <div class="djdt-scroll" aria-live="polite" aria-atomic="true"></div>
             </div>
             </div>
             """,
diff --git a/tests/panels/test_settings.py b/tests/panels/test_settings.py
index 5bf29d322..cde7f9ece 100644
--- a/tests/panels/test_settings.py
+++ b/tests/panels/test_settings.py
@@ -12,9 +12,9 @@ def test_panel_title(self):
         self.assertContains(
             response,
             """
-            <li id="djdt-SettingsPanel" class="djDebugPanelButton">
-            <input type="checkbox" checked title="Disable for next and successive requests" data-cookie="djdtSettingsPanel">
-            <a class="SettingsPanel" href="#" title="Settings from None">Settings</a>
+            <li id="djdt-SettingsPanel" class="djDebugPanelButton" role="checkbox">
+            <input type="checkbox" checked title="Disable for next and successive requests" data-cookie="djdtSettingsPanel" aria-label="Disable for next and successive requests">
+            <a class="SettingsPanel" href="#" title="Settings from None" role="link">Settings</a>
             </li>
             """,
             html=True,
@@ -22,14 +22,14 @@ def test_panel_title(self):
         self.assertContains(
             response,
             """
-            <div id="SettingsPanel" class="djdt-panelContent djdt-hidden">
+            <div id="SettingsPanel" class="djdt-panelContent djdt-hidden" role="region" aria-labelledby="djdt-SettingsPanel-title">
             <div class="djDebugPanelTitle">
-            <button type="button" class="djDebugClose">×</button>
+            <button type="button" class="djDebugClose" aria-label="Close">×</button>
             <h3>Settings from None</h3>
             </div>
             <div class="djDebugPanelContent">
-            <div class="djdt-loader"></div>
-            <div class="djdt-scroll"></div>
+            <div class="djdt-loader" role="alert" aria-busy="true"></div>
+            <div class="djdt-scroll" aria-live="polite" aria-atomic="true"></div>
             </div>
             </div>
             """,
diff --git a/tests/test_integration.py b/tests/test_integration.py
index b77b7cede..3df91da4c 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -446,7 +446,8 @@ def test_render_panels_in_request(self):
         # Verify the history panel was disabled
         self.assertIn(
             b'<input type="checkbox" data-cookie="djdtHistoryPanel" '
-            b'title="Enable for next and successive requests">',
+            b'title="Enable for next and successive requests" '
+            b'aria-label="Enable for next and successive requests">',
             response.content,
         )
         # Verify the a panel was rendered