diff --git a/src/components/FormLabelGroup.js b/src/components/FormLabelGroup.js
index be1066f41..a6f3f483a 100644
--- a/src/components/FormLabelGroup.js
+++ b/src/components/FormLabelGroup.js
@@ -5,6 +5,7 @@ import FormGroup from './FormGroup';
 import FormText from './FormText';
 import FormFeedback from './FormFeedback';
 import Label from './Label';
+import Required from './Required';
 import Row from './Row';
 
 const FormLabelGroup = (props) => {
@@ -32,7 +33,7 @@ const FormLabelGroup = (props) => {
       {label && (
         <Label for={inputId} sm={labelWidth} size={size} className={labelAlignment}>
           {label}
-          {required && label ? <span className="text-danger">&nbsp;*</span> : null}
+          {required && label ? <Required /> : null}
         </Label>
       )}
       <Col sm={inputContainerWidth}>
diff --git a/src/components/FormRow.js b/src/components/FormRow.js
index d375353a9..0401de80c 100644
--- a/src/components/FormRow.js
+++ b/src/components/FormRow.js
@@ -61,6 +61,7 @@ const FormRow = (props) => {
 
   const inputContainerWidth = stacked ? 12 : 9;
 
+  // TODO this should use FormLabelGroup vs duplicated code here:
   return (
     <FormGroup
       row
diff --git a/test/components/FormLabelGroup.spec.js b/test/components/FormLabelGroup.spec.js
index 4f375870d..8e1e05396 100644
--- a/test/components/FormLabelGroup.spec.js
+++ b/test/components/FormLabelGroup.spec.js
@@ -72,8 +72,8 @@ describe('<FormLabelGroup />', () => {
       assert.equal(label.length, 1);
       const labelChildren = label.children();
       assert.equal(labelChildren.at(0).text(), 'First Name');
-      assert.equal(labelChildren.at(1).text(), ' *');
-      assert.equal(labelChildren.at(1).prop('className'), 'text-danger');
+      const star = label.find('Required');
+      assert.equal(star.length, 1);
     });
   });