diff --git a/crispy_bootstrap5/templates/bootstrap5/field.html b/crispy_bootstrap5/templates/bootstrap5/field.html
index 8312e9b..2afe2bb 100644
--- a/crispy_bootstrap5/templates/bootstrap5/field.html
+++ b/crispy_bootstrap5/templates/bootstrap5/field.html
@@ -10,10 +10,14 @@
         {% endif %}
     {% endif %}
     <{% if tag %}{{ tag }}{% else %}div{% endif %} id="div_{{ field.auto_id }}" class="mb-3{% if field|is_checkbox and form_show_labels %} form-check{% else %}{% if 'form-horizontal' in form_class %} row{% endif %}{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
+
+
         {% if field.label and not field|is_checkbox and form_show_labels %}
-            <label {% if field.id_for_label %}for="{{ field.id_for_label }}"{% endif %} class="{% if 'form-horizontal' in form_class %}col-form-label{% else %}form-label{% endif %}{% if label_class %} {{ label_class }}{% endif %}{% if field.field.required %} requiredField{% endif %}">
+            {% if field.use_fieldset %}<fieldset>{% endif %}
+            <{% if field.use_fieldset %}legend{% else %}label{% endif %}
+                {% if field.id_for_label %}for="{{ field.id_for_label }}"{% endif %} class="{% if 'form-horizontal' in form_class %}col-form-label{% else %}form-label{% endif %}{% if label_class %} {{ label_class }}{% endif %}{% if field.field.required %} requiredField{% endif %}">
                 {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
-            </label>
+            </{% if field.use_fieldset %}legend{% else %}label{% endif %}>
         {% endif %}
 
         {% if field|is_checkboxselectmultiple or field|is_radioselect %}
@@ -58,6 +62,7 @@
                 {% if field_class %}</div>{% endif %}
             {% endif %}
         {% endif %}
+        {% if field.use_fieldset and field.label and form_show_labels %}</fieldset>{% endif %}
     </{% if tag %}{{ tag }}{% else %}div{% endif %}>
     {% if field|is_checkbox and tag != "td" %}
         {% if label_class %}
diff --git a/crispy_bootstrap5/templates/bootstrap5/layout/checkboxselectmultiple_inline.html b/crispy_bootstrap5/templates/bootstrap5/layout/checkboxselectmultiple_inline.html
index a494991..af9ca89 100644
--- a/crispy_bootstrap5/templates/bootstrap5/layout/checkboxselectmultiple_inline.html
+++ b/crispy_bootstrap5/templates/bootstrap5/layout/checkboxselectmultiple_inline.html
@@ -4,11 +4,13 @@
     <div id="div_{{ field.auto_id }}" class="mb-3{% if 'form-horizontal' in form_class %} row{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
 
         {% if field.label %}
-            <label for="{{ field.id_for_label }}"  class="{{ label_class }}{% if not inline_class %} col-form-label{% else %} form-label{% endif %}{% if field.field.required %} requiredField{% endif %}">
+            <fieldset>
+            <legend for="{{ field.id_for_label }}"  class="{{ label_class }}{% if not inline_class %} col-form-label{% else %} form-label{% endif %}{% if field.field.required %} requiredField{% endif %}">
                 {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
-            </label>
+            </legend>
         {% endif %}
 
         {% include 'bootstrap5/layout/radio_checkbox_select.html' %}
+        {% if field.label %}</fieldset>{% endif %}
     </div>
 {% endif %}
diff --git a/crispy_bootstrap5/templates/bootstrap5/layout/radioselect_inline.html b/crispy_bootstrap5/templates/bootstrap5/layout/radioselect_inline.html
index a494991..af9ca89 100644
--- a/crispy_bootstrap5/templates/bootstrap5/layout/radioselect_inline.html
+++ b/crispy_bootstrap5/templates/bootstrap5/layout/radioselect_inline.html
@@ -4,11 +4,13 @@
     <div id="div_{{ field.auto_id }}" class="mb-3{% if 'form-horizontal' in form_class %} row{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
 
         {% if field.label %}
-            <label for="{{ field.id_for_label }}"  class="{{ label_class }}{% if not inline_class %} col-form-label{% else %} form-label{% endif %}{% if field.field.required %} requiredField{% endif %}">
+            <fieldset>
+            <legend for="{{ field.id_for_label }}"  class="{{ label_class }}{% if not inline_class %} col-form-label{% else %} form-label{% endif %}{% if field.field.required %} requiredField{% endif %}">
                 {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
-            </label>
+            </legend>
         {% endif %}
 
         {% include 'bootstrap5/layout/radio_checkbox_select.html' %}
+        {% if field.label %}</fieldset>{% endif %}
     </div>
 {% endif %}
diff --git a/tests/results/checkboxes.html b/tests/results/checkboxes.html
index 2b7198d..addfa5b 100644
--- a/tests/results/checkboxes.html
+++ b/tests/results/checkboxes.html
@@ -1,19 +1,21 @@
 <form method="post">
     <div class="mb-3" id="div_id_checkboxes">
-        <label class="form-label requiredField">Checkboxes<span class="asteriskField">*</span></label>
-        <div>
-            <div class="form-check">
-                <input checked="checked" class="form-check-input" id="id_checkboxes_0" name="checkboxes" type="checkbox"
-                    value="1" /><label class="form-check-label" for="id_checkboxes_0">Option one</label>
+        <fieldset>
+            <legend class="form-label requiredField">Checkboxes<span class="asteriskField">*</span></legend>
+            <div>
+                <div class="form-check">
+                    <input checked="checked" class="form-check-input" id="id_checkboxes_0" name="checkboxes" type="checkbox"
+                        value="1" /><label class="form-check-label" for="id_checkboxes_0">Option one</label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input" id="id_checkboxes_1" name="checkboxes" type="checkbox"
+                        value="2" /><label class="form-check-label" for="id_checkboxes_1">Option two</label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input" id="id_checkboxes_2" name="checkboxes" type="checkbox"
+                        value="3" /><label class="form-check-label" for="id_checkboxes_2">Option three</label>
+                </div>
             </div>
-            <div class="form-check">
-                <input class="form-check-input" id="id_checkboxes_1" name="checkboxes" type="checkbox"
-                    value="2" /><label class="form-check-label" for="id_checkboxes_1">Option two</label>
-            </div>
-            <div class="form-check">
-                <input class="form-check-input" id="id_checkboxes_2" name="checkboxes" type="checkbox"
-                    value="3" /><label class="form-check-label" for="id_checkboxes_2">Option three</label>
-            </div>
-        </div>
+        </fieldset>
     </div>
 </form>
\ No newline at end of file
diff --git a/tests/results/radio.html b/tests/results/radio.html
index df9ae8a..70fe3b5 100644
--- a/tests/results/radio.html
+++ b/tests/results/radio.html
@@ -1,48 +1,48 @@
 <form method="post">
   <div id="div_id_radio" class="mb-3">
-    <label class="form-label requiredField"
-      > Radio<span class="asteriskField">*</span>
-    </label>
-    <div>
-      <div class="form-check">
-        <input
-          type="radio"
-          class="form-check-input"
-          name="radio"
-          id="id_radio_0"
-          value="1"
-          required
-        />
-        <label for="id_radio_0" class="form-check-label"
-          > Option one
-        </label>
-      </div>
-      <div class="form-check">
-        <input
-          type="radio"
-          class="form-check-input"
-          name="radio"
-          id="id_radio_1"
-          value="2"
-          required
-        />
-        <label for="id_radio_1" class="form-check-label"
-          > Option two
-        </label>
-      </div>
-      <div class="form-check">
-        <input
-          type="radio"
-          class="form-check-input"
-          name="radio"
-          id="id_radio_2"
-          value="3"
-          required
-        />
-        <label for="id_radio_2" class="form-check-label"
-          > Option three
-        </label>
-      </div>
-    </div>
+    <fieldset>
+        <legend class="form-label requiredField"> Radio<span class="asteriskField">*</span></legend>
+        <div>
+          <div class="form-check">
+            <input
+              type="radio"
+              class="form-check-input"
+              name="radio"
+              id="id_radio_0"
+              value="1"
+              required
+            />
+            <label for="id_radio_0" class="form-check-label"
+              > Option one
+            </label>
+          </div>
+          <div class="form-check">
+            <input
+              type="radio"
+              class="form-check-input"
+              name="radio"
+              id="id_radio_1"
+              value="2"
+              required
+            />
+            <label for="id_radio_1" class="form-check-label"
+              > Option two
+            </label>
+          </div>
+          <div class="form-check">
+            <input
+              type="radio"
+              class="form-check-input"
+              name="radio"
+              id="id_radio_2"
+              value="3"
+              required
+            />
+            <label for="id_radio_2" class="form-check-label"
+              > Option three
+            </label>
+          </div>
+        </div>
+    </fieldset>
   </div>
 </form>
diff --git a/tests/results/test_grouped_checkboxes.html b/tests/results/test_grouped_checkboxes.html
index 852ece7..a3434ad 100644
--- a/tests/results/test_grouped_checkboxes.html
+++ b/tests/results/test_grouped_checkboxes.html
@@ -1,25 +1,27 @@
 <form method="post">
-    <div class="mb-3" id="div_id_checkbox_select_multiple"><label class="form-label requiredField">Checkbox select
-            multiple<span class="asteriskField">*</span></label>
-        <div><strong>Audio</strong>
-            <div class="form-check"><input class="form-check-input" id="id_checkbox_select_multiple_0_0"
-                    name="checkbox_select_multiple" type="checkbox" value="vinyl"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_0_0">Vinyl</label></div>
-            <div class="form-check"><input class="form-check-input" id="id_checkbox_select_multiple_0_1"
-                    name="checkbox_select_multiple" type="checkbox" value="cd"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_0_1">CD</label></div><strong>Video</strong>
-            <div class="form-check"><input class="form-check-input" id="id_checkbox_select_multiple_1_0"
-                    name="checkbox_select_multiple" type="checkbox" value="vhs"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_1_0">VHS Tape</label></div>
-            <div class="form-check"><input class="form-check-input" id="id_checkbox_select_multiple_1_1"
-                    name="checkbox_select_multiple" type="checkbox" value="dvd"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_1_1">DVD</label></div>
-            <div class="form-check"><input class="form-check-input" id="id_checkbox_select_multiple_2"
-                    name="checkbox_select_multiple" type="checkbox" value="unknown"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_2">Unknown</label></div>
-        </div>
-        <div class="form-text">
-            help
-        </div>
+    <div class="mb-3" id="div_id_checkbox_select_multiple">
+        <fieldset>
+            <legend class="form-label requiredField">Checkbox select multiple<span class="asteriskField">*</span></legend>
+            <div><strong>Audio</strong>
+                <div class="form-check"><input class="form-check-input" id="id_checkbox_select_multiple_0_0"
+                        name="checkbox_select_multiple" type="checkbox" value="vinyl"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_0_0">Vinyl</label></div>
+                <div class="form-check"><input class="form-check-input" id="id_checkbox_select_multiple_0_1"
+                        name="checkbox_select_multiple" type="checkbox" value="cd"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_0_1">CD</label></div><strong>Video</strong>
+                <div class="form-check"><input class="form-check-input" id="id_checkbox_select_multiple_1_0"
+                        name="checkbox_select_multiple" type="checkbox" value="vhs"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_1_0">VHS Tape</label></div>
+                <div class="form-check"><input class="form-check-input" id="id_checkbox_select_multiple_1_1"
+                        name="checkbox_select_multiple" type="checkbox" value="dvd"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_1_1">DVD</label></div>
+                <div class="form-check"><input class="form-check-input" id="id_checkbox_select_multiple_2"
+                        name="checkbox_select_multiple" type="checkbox" value="unknown"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_2">Unknown</label></div>
+            </div>
+            <div class="form-text">
+                help
+            </div>
+        </fieldset>
     </div>
 </form>
diff --git a/tests/results/test_grouped_checkboxes_failing.html b/tests/results/test_grouped_checkboxes_failing.html
index ebd336e..8986753 100644
--- a/tests/results/test_grouped_checkboxes_failing.html
+++ b/tests/results/test_grouped_checkboxes_failing.html
@@ -1,28 +1,30 @@
 <form method="post">
-    <div class="mb-3" id="div_id_checkbox_select_multiple"><label class="form-label requiredField">Checkbox select
-            multiple<span class="asteriskField">*</span></label>
-        <div><strong>Audio</strong>
-            <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_checkbox_select_multiple_0_0"
-                    name="checkbox_select_multiple" type="checkbox" value="vinyl"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_0_0">Vinyl</label></div>
-            <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_checkbox_select_multiple_0_1"
-                    name="checkbox_select_multiple" type="checkbox" value="cd"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_0_1">CD</label></div><strong>Video</strong>
-            <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_checkbox_select_multiple_1_0"
-                    name="checkbox_select_multiple" type="checkbox" value="vhs"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_1_0">VHS Tape</label></div>
-            <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_checkbox_select_multiple_1_1"
-                    name="checkbox_select_multiple" type="checkbox" value="dvd"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_1_1">DVD</label></div>
-            <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_checkbox_select_multiple_2"
-                    name="checkbox_select_multiple" type="checkbox" value="unknown"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_2">Unknown</label>
-                <p class="invalid-feedback" id="error_1_id_checkbox_select_multiple"><strong>This field is
-                        required.</strong></p>
+    <div class="mb-3" id="div_id_checkbox_select_multiple">
+        <fieldset>
+            <legend class="form-label requiredField">Checkbox select multiple<span class="asteriskField">*</span></legend>
+            <div><strong>Audio</strong>
+                <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_checkbox_select_multiple_0_0"
+                        name="checkbox_select_multiple" type="checkbox" value="vinyl"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_0_0">Vinyl</label></div>
+                <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_checkbox_select_multiple_0_1"
+                        name="checkbox_select_multiple" type="checkbox" value="cd"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_0_1">CD</label></div><strong>Video</strong>
+                <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_checkbox_select_multiple_1_0"
+                        name="checkbox_select_multiple" type="checkbox" value="vhs"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_1_0">VHS Tape</label></div>
+                <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_checkbox_select_multiple_1_1"
+                        name="checkbox_select_multiple" type="checkbox" value="dvd"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_1_1">DVD</label></div>
+                <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_checkbox_select_multiple_2"
+                        name="checkbox_select_multiple" type="checkbox" value="unknown"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_2">Unknown</label>
+                    <p class="invalid-feedback" id="error_1_id_checkbox_select_multiple"><strong>This field is
+                            required.</strong></p>
+                </div>
             </div>
-        </div>
-        <div class="form-text">
-            help
-        </div>
+            <div class="form-text">
+                help
+            </div>
+        </fieldset>
     </div>
 </form>
diff --git a/tests/results/test_grouped_checkboxes_failing_lt50.html b/tests/results/test_grouped_checkboxes_failing_lt50.html
index 3df66b4..2783205 100644
--- a/tests/results/test_grouped_checkboxes_failing_lt50.html
+++ b/tests/results/test_grouped_checkboxes_failing_lt50.html
@@ -1,28 +1,30 @@
 <form method="post">
-    <div class="mb-3" id="div_id_checkbox_select_multiple"><label class="form-label requiredField">Checkbox select
-            multiple<span class="asteriskField">*</span></label>
-        <div><strong>Audio</strong>
-            <div class="form-check"><input class="form-check-input is-invalid" id="id_checkbox_select_multiple_0_0"
-                    name="checkbox_select_multiple" type="checkbox" value="vinyl"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_0_0">Vinyl</label></div>
-            <div class="form-check"><input class="form-check-input is-invalid" id="id_checkbox_select_multiple_0_1"
-                    name="checkbox_select_multiple" type="checkbox" value="cd"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_0_1">CD</label></div><strong>Video</strong>
-            <div class="form-check"><input class="form-check-input is-invalid" id="id_checkbox_select_multiple_1_0"
-                    name="checkbox_select_multiple" type="checkbox" value="vhs"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_1_0">VHS Tape</label></div>
-            <div class="form-check"><input class="form-check-input is-invalid" id="id_checkbox_select_multiple_1_1"
-                    name="checkbox_select_multiple" type="checkbox" value="dvd"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_1_1">DVD</label></div>
-            <div class="form-check"><input class="form-check-input is-invalid" id="id_checkbox_select_multiple_2"
-                    name="checkbox_select_multiple" type="checkbox" value="unknown"><label class="form-check-label"
-                    for="id_checkbox_select_multiple_2">Unknown</label>
-                <p class="invalid-feedback" id="error_1_id_checkbox_select_multiple"><strong>This field is
-                        required.</strong></p>
+    <div class="mb-3" id="div_id_checkbox_select_multiple">
+        <fieldset>
+            <legend class="form-label requiredField">Checkbox select multiple<span class="asteriskField">*</span></legend>
+            <div><strong>Audio</strong>
+                <div class="form-check"><input class="form-check-input is-invalid" id="id_checkbox_select_multiple_0_0"
+                        name="checkbox_select_multiple" type="checkbox" value="vinyl"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_0_0">Vinyl</label></div>
+                <div class="form-check"><input class="form-check-input is-invalid" id="id_checkbox_select_multiple_0_1"
+                        name="checkbox_select_multiple" type="checkbox" value="cd"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_0_1">CD</label></div><strong>Video</strong>
+                <div class="form-check"><input class="form-check-input is-invalid" id="id_checkbox_select_multiple_1_0"
+                        name="checkbox_select_multiple" type="checkbox" value="vhs"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_1_0">VHS Tape</label></div>
+                <div class="form-check"><input class="form-check-input is-invalid" id="id_checkbox_select_multiple_1_1"
+                        name="checkbox_select_multiple" type="checkbox" value="dvd"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_1_1">DVD</label></div>
+                <div class="form-check"><input class="form-check-input is-invalid" id="id_checkbox_select_multiple_2"
+                        name="checkbox_select_multiple" type="checkbox" value="unknown"><label class="form-check-label"
+                        for="id_checkbox_select_multiple_2">Unknown</label>
+                    <p class="invalid-feedback" id="error_1_id_checkbox_select_multiple"><strong>This field is
+                            required.</strong></p>
+                </div>
             </div>
-        </div>
-        <div class="form-text">
-            help
-        </div>
+            <div class="form-text">
+                help
+            </div>
+        </fieldset>
     </div>
 </form>
diff --git a/tests/results/test_grouped_radios.html b/tests/results/test_grouped_radios.html
index 9a20148..8fc8e8e 100644
--- a/tests/results/test_grouped_radios.html
+++ b/tests/results/test_grouped_radios.html
@@ -1,17 +1,19 @@
 <form method="post">
-    <div class="mb-3" id="div_id_radio"><label class="form-label requiredField">Radio<span
-                class="asteriskField">*</span></label>
-        <div><strong>Audio</strong>
-            <div class="form-check"><input class="form-check-input" id="id_radio_0_0" name="radio" required type="radio"
-                    value="vinyl"><label class="form-check-label" for="id_radio_0_0">Vinyl</label></div>
-            <div class="form-check"><input class="form-check-input" id="id_radio_0_1" name="radio" required type="radio"
-                    value="cd"><label class="form-check-label" for="id_radio_0_1">CD</label></div><strong>Video</strong>
-            <div class="form-check"><input class="form-check-input" id="id_radio_1_0" name="radio" required type="radio"
-                    value="vhs"><label class="form-check-label" for="id_radio_1_0">VHS Tape</label></div>
-            <div class="form-check"><input class="form-check-input" id="id_radio_1_1" name="radio" required type="radio"
-                    value="dvd"><label class="form-check-label" for="id_radio_1_1">DVD</label></div>
-            <div class="form-check"><input class="form-check-input" id="id_radio_2" name="radio" required type="radio"
-                    value="unknown"><label class="form-check-label" for="id_radio_2">Unknown</label></div>
-        </div>
+    <div class="mb-3" id="div_id_radio">
+        <fieldset>
+            <legend class="form-label requiredField">Radio<span class="asteriskField">*</span></legend>
+            <div><strong>Audio</strong>
+                <div class="form-check"><input class="form-check-input" id="id_radio_0_0" name="radio" required type="radio"
+                        value="vinyl"><label class="form-check-label" for="id_radio_0_0">Vinyl</label></div>
+                <div class="form-check"><input class="form-check-input" id="id_radio_0_1" name="radio" required type="radio"
+                        value="cd"><label class="form-check-label" for="id_radio_0_1">CD</label></div><strong>Video</strong>
+                <div class="form-check"><input class="form-check-input" id="id_radio_1_0" name="radio" required type="radio"
+                        value="vhs"><label class="form-check-label" for="id_radio_1_0">VHS Tape</label></div>
+                <div class="form-check"><input class="form-check-input" id="id_radio_1_1" name="radio" required type="radio"
+                        value="dvd"><label class="form-check-label" for="id_radio_1_1">DVD</label></div>
+                <div class="form-check"><input class="form-check-input" id="id_radio_2" name="radio" required type="radio"
+                        value="unknown"><label class="form-check-label" for="id_radio_2">Unknown</label></div>
+            </div>
+        </fieldset>
     </div>
 </form>
\ No newline at end of file
diff --git a/tests/results/test_grouped_radios_failing.html b/tests/results/test_grouped_radios_failing.html
index 947240c..9fcd598 100644
--- a/tests/results/test_grouped_radios_failing.html
+++ b/tests/results/test_grouped_radios_failing.html
@@ -1,25 +1,27 @@
 <form method="post">
-        <div class="mb-3" id="div_id_radio"><label class="form-label requiredField">Radio<span
-                                class="asteriskField">*</span></label>
-                <div><strong>Audio</strong>
-                        <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_radio_0_0"
-                                        name="radio" required type="radio" value="vinyl"><label class="form-check-label"
-                                        for="id_radio_0_0">Vinyl</label></div>
-                        <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_radio_0_1"
-                                        name="radio" required type="radio" value="cd"><label class="form-check-label"
-                                        for="id_radio_0_1">CD</label></div><strong>Video</strong>
-                        <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_radio_1_0"
-                                        name="radio" required type="radio" value="vhs"><label class="form-check-label"
-                                        for="id_radio_1_0">VHS Tape</label></div>
-                        <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_radio_1_1"
-                                        name="radio" required type="radio" value="dvd"><label class="form-check-label"
-                                        for="id_radio_1_1">DVD</label></div>
-                        <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_radio_2" name="radio"
-                                        required type="radio" value="unknown"><label class="form-check-label"
-                                        for="id_radio_2">Unknown</label>
-                                <p class="invalid-feedback" id="error_1_id_radio"><strong>This field is
-                                                required.</strong></p>
-                        </div>
-                </div>
-        </div>
+    <div class="mb-3" id="div_id_radio">
+        <fieldset>
+            <legend class="form-label requiredField">Radio<span class="asteriskField">*</span></legend>
+            <div><strong>Audio</strong>
+                    <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_radio_0_0"
+                                    name="radio" required type="radio" value="vinyl"><label class="form-check-label"
+                                    for="id_radio_0_0">Vinyl</label></div>
+                    <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_radio_0_1"
+                                    name="radio" required type="radio" value="cd"><label class="form-check-label"
+                                    for="id_radio_0_1">CD</label></div><strong>Video</strong>
+                    <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_radio_1_0"
+                                    name="radio" required type="radio" value="vhs"><label class="form-check-label"
+                                    for="id_radio_1_0">VHS Tape</label></div>
+                    <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_radio_1_1"
+                                    name="radio" required type="radio" value="dvd"><label class="form-check-label"
+                                    for="id_radio_1_1">DVD</label></div>
+                    <div class="form-check"><input aria-invalid="true" class="form-check-input is-invalid" id="id_radio_2" name="radio"
+                                    required type="radio" value="unknown"><label class="form-check-label"
+                                    for="id_radio_2">Unknown</label>
+                            <p class="invalid-feedback" id="error_1_id_radio"><strong>This field is
+                                            required.</strong></p>
+                    </div>
+            </div>
+        </fieldset>
+    </div>
 </form>
\ No newline at end of file
diff --git a/tests/results/test_grouped_radios_failing_lt50.html b/tests/results/test_grouped_radios_failing_lt50.html
index 4888f75..a1c010e 100644
--- a/tests/results/test_grouped_radios_failing_lt50.html
+++ b/tests/results/test_grouped_radios_failing_lt50.html
@@ -1,25 +1,27 @@
 <form method="post">
-        <div class="mb-3" id="div_id_radio"><label class="form-label requiredField">Radio<span
-                                class="asteriskField">*</span></label>
-                <div><strong>Audio</strong>
-                        <div class="form-check"><input class="form-check-input is-invalid" id="id_radio_0_0"
-                                        name="radio" required type="radio" value="vinyl"><label class="form-check-label"
-                                        for="id_radio_0_0">Vinyl</label></div>
-                        <div class="form-check"><input class="form-check-input is-invalid" id="id_radio_0_1"
-                                        name="radio" required type="radio" value="cd"><label class="form-check-label"
-                                        for="id_radio_0_1">CD</label></div><strong>Video</strong>
-                        <div class="form-check"><input class="form-check-input is-invalid" id="id_radio_1_0"
-                                        name="radio" required type="radio" value="vhs"><label class="form-check-label"
-                                        for="id_radio_1_0">VHS Tape</label></div>
-                        <div class="form-check"><input class="form-check-input is-invalid" id="id_radio_1_1"
-                                        name="radio" required type="radio" value="dvd"><label class="form-check-label"
-                                        for="id_radio_1_1">DVD</label></div>
-                        <div class="form-check"><input class="form-check-input is-invalid" id="id_radio_2" name="radio"
-                                        required type="radio" value="unknown"><label class="form-check-label"
-                                        for="id_radio_2">Unknown</label>
-                                <p class="invalid-feedback" id="error_1_id_radio"><strong>This field is
-                                                required.</strong></p>
-                        </div>
-                </div>
-        </div>
+    <div class="mb-3" id="div_id_radio">
+        <fieldset>
+            <legend class="form-label requiredField">Radio<span class="asteriskField">*</span></legend>
+            <div><strong>Audio</strong>
+                    <div class="form-check"><input class="form-check-input is-invalid" id="id_radio_0_0"
+                                    name="radio" required type="radio" value="vinyl"><label class="form-check-label"
+                                    for="id_radio_0_0">Vinyl</label></div>
+                    <div class="form-check"><input class="form-check-input is-invalid" id="id_radio_0_1"
+                                    name="radio" required type="radio" value="cd"><label class="form-check-label"
+                                    for="id_radio_0_1">CD</label></div><strong>Video</strong>
+                    <div class="form-check"><input class="form-check-input is-invalid" id="id_radio_1_0"
+                                    name="radio" required type="radio" value="vhs"><label class="form-check-label"
+                                    for="id_radio_1_0">VHS Tape</label></div>
+                    <div class="form-check"><input class="form-check-input is-invalid" id="id_radio_1_1"
+                                    name="radio" required type="radio" value="dvd"><label class="form-check-label"
+                                    for="id_radio_1_1">DVD</label></div>
+                    <div class="form-check"><input class="form-check-input is-invalid" id="id_radio_2" name="radio"
+                                    required type="radio" value="unknown"><label class="form-check-label"
+                                    for="id_radio_2">Unknown</label>
+                            <p class="invalid-feedback" id="error_1_id_radio"><strong>This field is
+                                            required.</strong></p>
+                    </div>
+            </div>
+        </fieldset>
+    </div>
 </form>
\ No newline at end of file
diff --git a/tests/test_layout_objects.py b/tests/test_layout_objects.py
index 0680562..b3026e0 100644
--- a/tests/test_layout_objects.py
+++ b/tests/test_layout_objects.py
@@ -231,8 +231,7 @@ def test_inline_radios(self):
         test_form = CheckboxesSampleForm()
         test_form.helper = FormHelper()
         test_form.helper.layout = Layout(InlineRadios("inline_radios"))
-        html = render_crispy_form(test_form)
-        assert html.count('form-check-inline"') == 2
+        assert parse_form(test_form) == parse_expected("inline_radios.html")
 
     @override_settings(CRISPY_CLASS_CONVERTERS=CONVERTERS)
     def test_accordion_and_accordiongroup(self):
@@ -579,3 +578,9 @@ def test_grouped_checkboxes_radios(self):
         else:
             expected = "test_grouped_radios_failing.html"
         assert parse_form(form) == parse_expected(expected)
+
+    def test_inline_checkboxes(self):
+        form = CheckboxesSampleForm()
+        form.helper = FormHelper()
+        form.helper.layout = InlineRadios("checkboxes")
+        assert parse_form(form) == parse_expected("inline_checkboxes.html")
diff --git a/tests/test_tags.py b/tests/test_tags.py
index 0ba29d6..cae9880 100644
--- a/tests/test_tags.py
+++ b/tests/test_tags.py
@@ -150,7 +150,7 @@ def test_crispy_filter_with_form():
 
     assert "<td>" not in html
     assert "id_is_company" in html
-    assert html.count("<label") == 7
+    assert html.count("<label") == 6
 
 
 def test_crispy_filter_with_formset():