diff --git a/tests/behat/features/styleguide.field.checkbox.feature b/tests/behat/features/styleguide.field.checkbox.feature
index 8044451bb..9ebf0d732 100644
--- a/tests/behat/features/styleguide.field.checkbox.feature
+++ b/tests/behat/features/styleguide.field.checkbox.feature
@@ -37,7 +37,7 @@ Feature: Field, Checkbox
     # Validate: Checkbox, Title visually hidden, default value, description, no error
     And I should see an ".ct-field.js-form-item-test-checkbox-3" element
     And I should see an ".ct-field.js-form-item-test-checkbox-3 label[for='edit-test-checkbox-3']" element
-    And I should see an ".ct-field.js-form-item-test-checkbox-3 label.ct-visually-hidden" element
+    And I should see an ".ct-field.js-form-item-test-checkbox-3 legend.ct-visually-hidden" element
     And I should see a ".ct-field.js-form-item-test-checkbox-3 .ct-field-description" element
     And I should see a ".ct-field.js-form-item-test-checkbox-3 input[type='checkbox']" element
     And I should see a ".ct-field.js-form-item-test-checkbox-3 input[type='checkbox'][checked]" element
@@ -62,8 +62,8 @@ Feature: Field, Checkbox
 
     # Validate: Checkbox, Title visible, default value, no description, disabled
     And I should see an ".ct-field.js-form-item-test-checkbox-5" element
-    And I should see an ".ct-field.js-form-item-test-checkbox-5 label.ct-field__title" element
-    And I should not see an ".ct-field.js-form-item-test-checkbox-5 label.ct-field__title[for='edit-test-checkbox-5']" element
+    And I should see an ".ct-field.js-form-item-test-checkbox-5 legend.ct-field__title" element
+    And I should not see an ".ct-field.js-form-item-test-checkbox-5 legend.ct-field__title[for='edit-test-checkbox-5']" element
     And I should see an ".ct-field.js-form-item-test-checkbox-5 label[for='edit-test-checkbox-5']" element
     And I should not see a ".ct-field.js-form-item-test-checkbox-5 .ct-field-description" element
     And I should see a ".ct-field.js-form-item-test-checkbox-5 input[type='checkbox']" element
diff --git a/tests/behat/features/styleguide.field.checkboxes.feature b/tests/behat/features/styleguide.field.checkboxes.feature
index 2b8f647c4..5a23dcaca 100644
--- a/tests/behat/features/styleguide.field.checkboxes.feature
+++ b/tests/behat/features/styleguide.field.checkboxes.feature
@@ -10,7 +10,7 @@ Feature: Field, Checkboxes
     # Validate: Checkboxes, Title visible, no default value, no description, no error
     And I should see an ".ct-field.js-form-item-test-checkboxes-1" element
     And I should see an ".ct-field.js-form-item-test-checkboxes-1 label" element
-    And I should see an ".ct-field.js-form-item-test-checkboxes-1 label:contains('Checkboxes, Title visible, no default value, no description, no error')" element
+    And I should see an ".ct-field.js-form-item-test-checkboxes-1 legend:contains('Checkboxes, Title visible, no default value, no description, no error')" element
     And I should not see a ".ct-field.js-form-item-test-checkboxes-1 .ct-field-description" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-1 ul.ct-item-list" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-1 input[type='checkbox']" element
@@ -29,7 +29,7 @@ Feature: Field, Checkboxes
     And I should see a ".ct-field.js-form-item-test-checkboxes-2[data-wrapper-test='test-wrapper-attribute-value']" element
     And I should not see a ".ct-field.js-form-item-test-checkboxes-2[data-test='test-attribute-value']" element
     And I should see an ".ct-field.js-form-item-test-checkboxes-2 label" element
-    And I should see an ".ct-field.js-form-item-test-checkboxes-2 label:contains('Checkboxes, Title visible, default value, no description, no error, required, with attributes')" element
+    And I should see an ".ct-field.js-form-item-test-checkboxes-2 legend:contains('Checkboxes, Title visible, default value, no description, no error, required, with attributes')" element
     And I should not see a ".ct-field.js-form-item-test-checkboxes-2 .ct-field-description" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-2 ul.ct-item-list" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-2 input[type='checkbox']" element
@@ -54,8 +54,8 @@ Feature: Field, Checkboxes
 
     # Validate: Checkboxes, Title visually hidden, default value, description, no error
     And I should see an ".ct-field.js-form-item-test-checkboxes-3" element
-    And I should see an ".ct-field.js-form-item-test-checkboxes-3 label.ct-visually-hidden" element
-    And I should see a ".ct-field.js-form-item-test-checkboxes-3 label:contains('Checkboxes, Title visually hidden, default value, description, no error')" element
+    And I should see an ".ct-field.js-form-item-test-checkboxes-3 legend.ct-visually-hidden" element
+    And I should see a ".ct-field.js-form-item-test-checkboxes-3 legend:contains('Checkboxes, Title visually hidden, default value, description, no error')" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-3 .ct-field-description:contains('This is a description')" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-3 ul.ct-item-list" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-3 input[type='checkbox']" element
@@ -85,7 +85,7 @@ Feature: Field, Checkboxes
     # Validate: Checkboxes, Title visible, default value, no description, disabled
     And I should see an ".ct-field.js-form-item-test-checkboxes-5" element
     And I should see an ".ct-field.js-form-item-test-checkboxes-5 label" element
-    And I should see an ".ct-field.js-form-item-test-checkboxes-5 label:contains('Checkboxes, Title visible, default value, no description, disabled')" element
+    And I should see an ".ct-field.js-form-item-test-checkboxes-5 legend:contains('Checkboxes, Title visible, default value, no description, disabled')" element
     And I should not see a ".ct-field.js-form-item-test-checkboxes-5 .ct-field-description" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-5 ul.ct-item-list" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-5 input[type='checkbox']" element
diff --git a/tests/behat/features/styleguide.field.radios.feature b/tests/behat/features/styleguide.field.radios.feature
index 1b905a466..411e8f981 100644
--- a/tests/behat/features/styleguide.field.radios.feature
+++ b/tests/behat/features/styleguide.field.radios.feature
@@ -9,8 +9,8 @@ Feature: Field, Radios
 
     # Validate: Radios, Title visible, no default value, no description, no error
     And I should see an ".ct-field.js-form-item-test-radios-1" element
-    And I should see an ".ct-field.js-form-item-test-radios-1 label" element
-    And I should see an ".ct-field.js-form-item-test-radios-1 label:contains('Radios, Title visible, no default value, no description, no error')" element
+    And I should see an ".ct-field.js-form-item-test-radios-1 legend" element
+    And I should see an ".ct-field.js-form-item-test-radios-1 legend:contains('Radios, Title visible, no default value, no description, no error')" element
     And I should not see a ".ct-field.js-form-item-test-radios-1 .ct-field-description" element
     And I should see a ".ct-field.js-form-item-test-radios-1 ul.ct-item-list" element
     And I should see a ".ct-field.js-form-item-test-radios-1 input[type='radio']" element
@@ -28,8 +28,8 @@ Feature: Field, Radios
     And I should not see a ".ct-field.js-form-item-test-radios-2.test-class" element
     And I should see a ".ct-field.js-form-item-test-radios-2[data-wrapper-test='test-wrapper-attribute-value']" element
     And I should not see a ".ct-field.js-form-item-test-radios-2[data-test='test-attribute-value']" element
-    And I should see an ".ct-field.js-form-item-test-radios-2 label" element
-    And I should see an ".ct-field.js-form-item-test-radios-2 label:contains('Radios, Title visible, default value, no description, no error, required, with attributes')" element
+    And I should see an ".ct-field.js-form-item-test-radios-2 legend" element
+    And I should see an ".ct-field.js-form-item-test-radios-2 legend:contains('Radios, Title visible, default value, no description, no error, required, with attributes')" element
     And I should not see a ".ct-field.js-form-item-test-radios-2 .ct-field-description" element
     And I should see a ".ct-field.js-form-item-test-radios-2 ul.ct-item-list" element
     And I should see a ".ct-field.js-form-item-test-radios-2 input[type='radio']" element
@@ -54,8 +54,8 @@ Feature: Field, Radios
 
     # Validate: Radios, Title visually hidden, default value, description, no error
     And I should see an ".ct-field.js-form-item-test-radios-3" element
-    And I should see an ".ct-field.js-form-item-test-radios-3 label.ct-visually-hidden" element
-    And I should see a ".ct-field.js-form-item-test-radios-3 label:contains('Radios, Title visually hidden, default value, description, no error')" element
+    And I should see an ".ct-field.js-form-item-test-radios-3 legend.ct-visually-hidden" element
+    And I should see a ".ct-field.js-form-item-test-radios-3 legend:contains('Radios, Title visually hidden, default value, description, no error')" element
     And I should see a ".ct-field.js-form-item-test-radios-3 .ct-field-description:contains('This is a description')" element
     And I should see a ".ct-field.js-form-item-test-radios-3 ul.ct-item-list" element
     And I should see a ".ct-field.js-form-item-test-radios-3 input[type='radio']" element
@@ -85,7 +85,7 @@ Feature: Field, Radios
     # Validate: Radios, Title visible, default value, no description, disabled
     And I should see an ".ct-field.js-form-item-test-radios-5" element
     And I should see an ".ct-field.js-form-item-test-radios-5 label" element
-    And I should see an ".ct-field.js-form-item-test-radios-5 label:contains('Radios, Title visible, default value, no description, disabled')" element
+    And I should see an ".ct-field.js-form-item-test-radios-5 legend:contains('Radios, Title visible, default value, no description, disabled')" element
     And I should not see a ".ct-field.js-form-item-test-radios-5 .ct-field-description" element
     And I should see a ".ct-field.js-form-item-test-radios-5 ul.ct-item-list" element
     And I should see a ".ct-field.js-form-item-test-radios-5 input[type='radio']" element