diff --git a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py
index b022af36e2..375d729e1b 100644
--- a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py
+++ b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py
@@ -60,7 +60,6 @@ class LMSInstructorDashboardA11yTest(BaseInstructorDashboardTest):
     def test_instructor_dashboard_a11y(self):
         self.instructor_dashboard_page.a11y_audit.config.set_rules({
             "ignore": [
-                'checkboxgroup',  # TODO: AC-552
                 'link-href',  # TODO: AC-491
             ]
         })
@@ -1266,7 +1265,6 @@ class CertificateInvalidationTest(BaseInstructorDashboardTest):
         ])
         self.certificates_section.a11y_audit.config.set_rules({
             "ignore": [
-                'checkboxgroup',  # TODO: AC-491
                 'duplicate-id',  # TODO: AC-491
                 'radiogroup',  # TODO: AC-491
             ]
diff --git a/lms/templates/instructor/instructor_dashboard_2/certificates.html b/lms/templates/instructor/instructor_dashboard_2/certificates.html
index 048510f427..abd9b55374 100644
--- a/lms/templates/instructor/instructor_dashboard_2/certificates.html
+++ b/lms/templates/instructor/instructor_dashboard_2/certificates.html
@@ -114,24 +114,27 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
             <p class="under-heading">
                 ${_('To regenerate certificates for your course, choose the learners who will receive regenerated certificates and click Regenerate Certificates.')}
             </p>
-
-                <label style="display: inline" for="certificate_status_${section_data['status'].downloadable}">
-                    <input id="certificate_status_${section_data['status'].downloadable}" type="checkbox" name="certificate_statuses" value="${section_data['status'].downloadable}">
-                    ${_("Regenerate for learners who have already received certificates. ({count})").format(count=section_data['certificate_statuses_with_count'].get(section_data['status'].downloadable, 0))}
-                </label>
-                <br/>
-                <label style="display: inline" for="certificate_status_${section_data['status'].notpassing}">
-                    <input id="certificate_status_${section_data['status'].notpassing}" type="checkbox" name="certificate_statuses" value="${section_data['status'].notpassing}">
-                    ${_("Regenerate for learners who have not received certificates. ({count})").format(count=section_data['certificate_statuses_with_count'].get(section_data['status'].notpassing, 0))}
-                </label>
-                <br/>
-                <label style="display: inline" for="certificate_status_${section_data['status'].error}">
-                    <input id="certificate_status_${section_data['status'].error}" type="checkbox" name="certificate_statuses" value="${section_data['status'].error}">
-                    ${_("Regenerate for learners in an error state. ({count})").format(count=section_data['certificate_statuses_with_count'].get(section_data['status'].error, 0))}
-                </label>
-                <br/>
-                <br/>
-
+            <fieldset>
+                <legend class="sr">${_('Choose learner types for regeneration')}</legend>
+                <div>
+                    <label style="display: inline" for="certificate_status_${section_data['status'].downloadable}">
+                        <input id="certificate_status_${section_data['status'].downloadable}" type="checkbox" name="certificate_statuses" value="${section_data['status'].downloadable}">
+                        ${_("Regenerate for learners who have already received certificates. ({count})").format(count=section_data['certificate_statuses_with_count'].get(section_data['status'].downloadable, 0))}
+                    </label>
+                </div>
+                <div>
+                    <label style="display: inline" for="certificate_status_${section_data['status'].notpassing}">
+                        <input id="certificate_status_${section_data['status'].notpassing}" type="checkbox" name="certificate_statuses" value="${section_data['status'].notpassing}">
+                        ${_("Regenerate for learners who have not received certificates. ({count})").format(count=section_data['certificate_statuses_with_count'].get(section_data['status'].notpassing, 0))}
+                    </label>
+                </div>
+                <div>
+                    <label style="display: inline" for="certificate_status_${section_data['status'].error}">
+                        <input id="certificate_status_${section_data['status'].error}" type="checkbox" name="certificate_statuses" value="${section_data['status'].error}">
+                        ${_("Regenerate for learners in an error state. ({count})").format(count=section_data['certificate_statuses_with_count'].get(section_data['status'].error, 0))}
+                    </label>
+                </div>
+            </fieldset>
             <input type="button" class="btn-blue" id="btn-start-regenerating-certificates" value="${_('Regenerate Certificates')}" data-endpoint="${section_data['urls']['start_certificate_regeneration']}"/>
         </form>
         <div class="certificate-regeneration-status"></div>