diff --git a/src/Forms/CheckboxSetField.php b/src/Forms/CheckboxSetField.php
index 1d8f94709..1af9f9cbe 100644
--- a/src/Forms/CheckboxSetField.php
+++ b/src/Forms/CheckboxSetField.php
@@ -90,6 +90,7 @@ class CheckboxSetField extends MultiSelectField
             $options->push(new ArrayData(array(
                 'ID' => $itemID,
                 'Class' => $extraClass,
+                'Role' => 'option',
                 'Name' => "{$this->name}[{$itemValue}]",
                 'Value' => $itemValue,
                 'Title' => $title,
diff --git a/src/Forms/OptionsetField.php b/src/Forms/OptionsetField.php
index 7054b0759..934d7e1e5 100644
--- a/src/Forms/OptionsetField.php
+++ b/src/Forms/OptionsetField.php
@@ -72,6 +72,7 @@ class OptionsetField extends SingleSelectField
         return new ArrayData(array(
             'ID' => $this->getOptionID($value),
             'Class' => $this->getOptionClass($value, $odd),
+            'Role' => 'option',
             'Name' => $this->getOptionName(),
             'Value' => $value,
             'Title' => $title,
diff --git a/templates/SilverStripe/Forms/CheckboxSetField.ss b/templates/SilverStripe/Forms/CheckboxSetField.ss
index f869d596f..75d1a62b9 100644
--- a/templates/SilverStripe/Forms/CheckboxSetField.ss
+++ b/templates/SilverStripe/Forms/CheckboxSetField.ss
@@ -1,7 +1,7 @@
 <ul $AttributesHTML>
 	<% if $Options.Count %>
 		<% loop $Options %>
-			<li class="$Class">
+			<li class="$Class" role="$Role">
 				<input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$Value.ATT"<% if $isChecked %> checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> />
 				<label for="$ID">$Title</label>
 			</li>
diff --git a/templates/SilverStripe/Forms/OptionsetField.ss b/templates/SilverStripe/Forms/OptionsetField.ss
index 70012bb6f..35d8f6286 100644
--- a/templates/SilverStripe/Forms/OptionsetField.ss
+++ b/templates/SilverStripe/Forms/OptionsetField.ss
@@ -1,6 +1,6 @@
 <ul $AttributesHTML>
 	<% loop $Options %>
-		<li class="$Class">
+		<li class="$Class" role="$Role">
 			<input id="$ID" class="radio" name="$Name" type="radio" value="$Value"<% if $isChecked %> checked<% end_if %><% if $isDisabled %> disabled<% end_if %> <% if $Up.Required %>required<% end_if %> />
 			<label for="$ID">$Title</label>
 		</li>