diff --git a/poll/public/html/survey.html b/poll/public/html/survey.html
index 853cd29..be403fc 100644
--- a/poll/public/html/survey.html
+++ b/poll/public/html/survey.html
@@ -5,18 +5,18 @@
     <div class="poll-block-form-wrapper">
         <h3 class="poll-header">{{block_name}}</h3>
         <form>
-            <table class="survey-table">
-                <thead>
-                  <tr>
+            <table class="survey-table" role="presentation">
+                <thead role="presentation">
+                  <tr role="group">
                       <td></td>
                       {% for answer, label in answers %}
-                        <th id="poll-{{block_id}}-{{answer}}" class="survey-answer" scope="col">{{label}}</th>
+                        <th role="presentation" id="poll-{{block_id}}-{{answer}}" class="survey-answer" scope="col">{{label}}</th>
                       {% endfor %}
                   </tr>
                 </thead>
             {% for key, question in questions %}
                 <tr class="survey-row" role="group" aria-labelledby="poll-{{block_id}}-{{key}}">
-                    <th id="poll-{{block_id}}-{{key}}" class="survey-question" scope="row">
+                    <th role="presentation" id="poll-{{block_id}}-{{key}}" class="survey-question" scope="row">
                         {% if question.img %}
                             <div class="poll-image-td">
                                 <img src="{{question.img}}" alt="{{question.img_alt|default_if_none:''}}"/>
@@ -25,7 +25,7 @@ <h3 class="poll-header">{{block_name}}</h3>
                       {{question.label|safe}}
                     </th>
                 {% for answer, label in answers %}
-                    <td class="survey-option" headers="poll-{{block_id}}-{{key}} poll-{{block_id}}-{{answer}}">
+                    <td role="presentation" class="survey-option" headers="poll-{{block_id}}-{{key}} poll-{{block_id}}-{{answer}}">
                         {% with answer_count=forloop.counter %}
                             {% for answer, label in answers %}
                                 {% if forloop.counter == answer_count %}
@@ -37,7 +37,7 @@ <h3 class="poll-header">{{block_name}}</h3>
                                                {% if question.img_alt %}
                                                aria-label="{{question.img_alt}} {{label}}"
                                                {% else %}
-                                               aria-label="{{question.label|striptags}} {{label}}"
+                                               aria-label="{{label|safe}}"
                                                {% endif %}
                                         />
                                         <span class="visible-mobile-only">{{label}}</span>
diff --git a/setup.py b/setup.py
index 0f498bf..60351a9 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ def package_data(pkg, roots):
 
 setup(
     name='xblock-poll',
-    version='1.9.2',
+    version='1.9.3',
     description='An XBlock for polling users.',
     packages=[
         'poll',
diff --git a/tests/integration/test_functions.py b/tests/integration/test_functions.py
index 452de4d..5325660 100644
--- a/tests/integration/test_functions.py
+++ b/tests/integration/test_functions.py
@@ -186,7 +186,7 @@ def test_survey_options_a11y(self):
             self.assertEqual(len(options), len(answers))
             for j, option in enumerate(options):
                 self.assertIn(answer_text[j], option.get_attribute('aria-label'))
-                self.assertIn(question_text[i], option.get_attribute('aria-label'))
+                self.assertIn(option.get_attribute('aria-label'), answer_text)
 
     def fill_survey(self, assert_submit=False):
         """