diff --git a/packages/react-core/src/components/InputGroup/InputGroup.tsx b/packages/react-core/src/components/InputGroup/InputGroup.tsx
index 1872146594a..499ae7ad92b 100644
--- a/packages/react-core/src/components/InputGroup/InputGroup.tsx
+++ b/packages/react-core/src/components/InputGroup/InputGroup.tsx
@@ -31,9 +31,11 @@ export const InputGroup: React.FunctionComponent<InputGroupProps> = ({
     <div ref={inputGroupRef} className={css(styles.inputGroup, className)} {...props}>
       {idItem
         ? React.Children.map(children, (child: any) =>
-            formCtrls.includes(child.type.displayName)
-              ? React.cloneElement(child, { 'aria-describedby': idItem.props.id })
-              : child
+            !formCtrls.includes(child.type.displayName) || child.props['aria-describedby']
+              ? child
+              : React.cloneElement(child, {
+                  'aria-describedby': child.props['aria-describedby'] === '' ? undefined : idItem.props.id
+                })
           )
         : children}
     </div>
diff --git a/packages/react-core/src/components/InputGroup/__tests__/InputGroup.test.tsx b/packages/react-core/src/components/InputGroup/__tests__/InputGroup.test.tsx
index 7580d6d0070..d91a03091fd 100644
--- a/packages/react-core/src/components/InputGroup/__tests__/InputGroup.test.tsx
+++ b/packages/react-core/src/components/InputGroup/__tests__/InputGroup.test.tsx
@@ -20,4 +20,34 @@ describe('InputGroup', () => {
     );
     expect(screen.getByLabelText('some text')).toHaveAttribute('aria-describedby', 'button-id');
   });
+
+  test('wont add aria-describedby to form-control if describedby is empty string', () => {
+    // In this test, TextInput is a form-control component and Button is not.
+    // If Button has an id props, this should be used in aria-describedby, but this
+    // example has an empty aria-describedby to prevent that from happening.
+    render(
+      <InputGroup>
+        <TextInput value="some data" aria-describedby="" aria-label="some text" />
+        <Button id="button-id">
+          hello
+        </Button>
+      </InputGroup>
+    );
+    expect(screen.getByLabelText('some text')).not.toHaveAttribute('aria-describedby');
+  });
+
+  test('wont override aria-describedby in form-control if describedby has value', () => {
+    // In this test, TextInput is a form-control component and Button is not.
+    // If Button has an id props, this should be used in aria-describedby, but this
+    // example has a predefined aria-describedby to prevent that from happening
+    render(
+      <InputGroup>
+        <TextInput value="some data" aria-describedby="myself" aria-label="some text" />
+        <Button id="button-id">
+          hello
+        </Button>
+      </InputGroup>
+    );
+    expect(screen.getByLabelText('some text')).toHaveAttribute('aria-describedby', 'myself');
+  });
 });
diff --git a/packages/react-core/src/components/NumberInput/NumberInput.tsx b/packages/react-core/src/components/NumberInput/NumberInput.tsx
index 2af531ba82c..a3da0f3fa17 100644
--- a/packages/react-core/src/components/NumberInput/NumberInput.tsx
+++ b/packages/react-core/src/components/NumberInput/NumberInput.tsx
@@ -5,7 +5,8 @@ import MinusIcon from '@patternfly/react-icons/dist/esm/icons/minus-icon';
 import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
 import { InputGroup } from '../InputGroup';
 import { Button, ButtonProps } from '../Button';
-import { KEY_CODES } from '../../helpers';
+import { KEY_CODES, ValidatedOptions } from '../../helpers';
+import { TextInput } from '../TextInput';
 
 export interface NumberInputProps extends React.HTMLProps<HTMLDivElement> {
   /** Value of the number input */
@@ -16,6 +17,10 @@ export interface NumberInputProps extends React.HTMLProps<HTMLDivElement> {
   widthChars?: number;
   /** Indicates the whole number input should be disabled */
   isDisabled?: boolean;
+  /** Value to indicate if the input is modified to show that validation state
+   * @beta
+   */
+  validated?: 'default' | 'error' | 'warning' | 'success' | ValidatedOptions;
   /** Callback for the minus button */
   onMinus?: (event: React.MouseEvent, name?: string) => void;
   /** Callback for the text input changing */
@@ -66,6 +71,7 @@ export const NumberInput: React.FunctionComponent<NumberInputProps> = ({
   className,
   widthChars,
   isDisabled = false,
+  validated = ValidatedOptions.default,
   onMinus = () => {},
   onChange,
   onBlur,
@@ -99,7 +105,7 @@ export const NumberInput: React.FunctionComponent<NumberInputProps> = ({
 
   return (
     <div
-      className={css(styles.numberInput, className)}
+      className={css(styles.numberInput, validated !== 'default' && styles.modifiers.status, className)}
       {...(widthChars && {
         style: {
           '--pf-c-number-input--c-form-control--width-chars': widthChars,
@@ -121,18 +127,18 @@ export const NumberInput: React.FunctionComponent<NumberInputProps> = ({
             <MinusIcon aria-hidden="true" />
           </span>
         </Button>
-        <input
-          className={css(styles.formControl)}
+        <TextInput
           type="number"
           value={value}
           name={inputName}
           aria-label={inputAriaLabel}
-          {...(isDisabled && { disabled: isDisabled })}
-          {...(onChange && { onChange })}
+          {...(isDisabled && { isDisabled })}
+          {...(onChange && { onChange: (value, event) => onChange(event) })}
           onBlur={handleBlur}
-          {...(!onChange && { readOnly: true })}
-          {...inputProps}
+          {...(!onChange && { isReadOnly: true })}
           onKeyDown={keyDownHandler}
+          validated={validated}
+          {...inputProps}
         />
         <Button
           variant="control"
diff --git a/packages/react-core/src/components/NumberInput/__tests__/NumberInput.test.tsx b/packages/react-core/src/components/NumberInput/__tests__/NumberInput.test.tsx
index 1a7c4835ee9..6b1a3fbf3e7 100644
--- a/packages/react-core/src/components/NumberInput/__tests__/NumberInput.test.tsx
+++ b/packages/react-core/src/components/NumberInput/__tests__/NumberInput.test.tsx
@@ -9,6 +9,21 @@ describe('numberInput', () => {
     expect(asFragment()).toMatchSnapshot();
   });
 
+  test('renders success validated', () => {
+    const { asFragment } = render(<NumberInput validated='success' />);
+    expect(asFragment()).toMatchSnapshot();
+  })
+
+  test('renders error validated', () => {
+    const { asFragment } = render(<NumberInput validated='error' />);
+    expect(asFragment()).toMatchSnapshot();
+  })
+
+  test('renders warning validated', () => {
+    const { asFragment } = render(<NumberInput validated='warning' />);
+    expect(asFragment()).toMatchSnapshot();
+  })
+
   test('renders value', () => {
     const { asFragment } = render(<NumberInput value={90} />);
     expect(asFragment()).toMatchSnapshot();
@@ -54,6 +69,7 @@ describe('numberInput', () => {
       <NumberInput
         value={5}
         onMinus={jest.fn()}
+        inputProps={{ 'aria-describedby': '' }}
         minusBtnProps={{ id: 'minus-id' }}
         onPlus={jest.fn()}
         plusBtnProps={{ id: 'plus-id' }}
diff --git a/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap b/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
index 9141e2f0927..4bfe2cc676b 100644
--- a/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
+++ b/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
@@ -12,7 +12,7 @@ exports[`numberInput disables lower threshold 1`] = `
         aria-disabled="true"
         aria-label="Minus"
         class="pf-c-button pf-m-control pf-m-disabled"
-        data-ouia-component-id="OUIA-Generated-Button-control-7"
+        data-ouia-component-id="OUIA-Generated-Button-control-13"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         disabled=""
@@ -37,8 +37,12 @@ exports[`numberInput disables lower threshold 1`] = `
         </span>
       </button>
       <input
+        aria-invalid="false"
         aria-label="Input"
         class="pf-c-form-control"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-7"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
         readonly=""
         type="number"
         value="0"
@@ -47,7 +51,7 @@ exports[`numberInput disables lower threshold 1`] = `
         aria-disabled="false"
         aria-label="Plus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-8"
+        data-ouia-component-id="OUIA-Generated-Button-control-14"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -87,7 +91,7 @@ exports[`numberInput disables upper threshold 1`] = `
         aria-disabled="false"
         aria-label="Minus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-9"
+        data-ouia-component-id="OUIA-Generated-Button-control-15"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -111,8 +115,12 @@ exports[`numberInput disables upper threshold 1`] = `
         </span>
       </button>
       <input
+        aria-invalid="false"
         aria-label="Input"
         class="pf-c-form-control"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-8"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
         readonly=""
         type="number"
         value="100"
@@ -121,7 +129,7 @@ exports[`numberInput disables upper threshold 1`] = `
         aria-disabled="true"
         aria-label="Plus"
         class="pf-c-button pf-m-control pf-m-disabled"
-        data-ouia-component-id="OUIA-Generated-Button-control-10"
+        data-ouia-component-id="OUIA-Generated-Button-control-16"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         disabled=""
@@ -162,7 +170,7 @@ exports[`numberInput passes button props successfully 1`] = `
         aria-disabled="false"
         aria-label="Minus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-19"
+        data-ouia-component-id="OUIA-Generated-Button-control-25"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         id="minus-id"
@@ -187,8 +195,12 @@ exports[`numberInput passes button props successfully 1`] = `
         </span>
       </button>
       <input
+        aria-invalid="false"
         aria-label="Input"
         class="pf-c-form-control"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-13"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
         readonly=""
         type="number"
         value="5"
@@ -197,7 +209,7 @@ exports[`numberInput passes button props successfully 1`] = `
         aria-disabled="false"
         aria-label="Plus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-20"
+        data-ouia-component-id="OUIA-Generated-Button-control-26"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         id="plus-id"
@@ -238,7 +250,7 @@ exports[`numberInput passes input props successfully 1`] = `
         aria-disabled="false"
         aria-label="Minus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-17"
+        data-ouia-component-id="OUIA-Generated-Button-control-23"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -262,8 +274,12 @@ exports[`numberInput passes input props successfully 1`] = `
         </span>
       </button>
       <input
+        aria-invalid="false"
         aria-label="Input"
         class="pf-c-form-control"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-12"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
         name="test-name"
         type="number"
         value="5"
@@ -272,7 +288,7 @@ exports[`numberInput passes input props successfully 1`] = `
         aria-disabled="false"
         aria-label="Plus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-18"
+        data-ouia-component-id="OUIA-Generated-Button-control-24"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -313,7 +329,7 @@ exports[`numberInput renders custom width 1`] = `
         aria-disabled="false"
         aria-label="Minus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-15"
+        data-ouia-component-id="OUIA-Generated-Button-control-21"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -337,8 +353,12 @@ exports[`numberInput renders custom width 1`] = `
         </span>
       </button>
       <input
+        aria-invalid="false"
         aria-label="Input"
         class="pf-c-form-control"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-11"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
         readonly=""
         type="number"
         value="5"
@@ -347,7 +367,7 @@ exports[`numberInput renders custom width 1`] = `
         aria-disabled="false"
         aria-label="Plus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-16"
+        data-ouia-component-id="OUIA-Generated-Button-control-22"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -412,8 +432,12 @@ exports[`numberInput renders defaults & extra props 1`] = `
         </span>
       </button>
       <input
+        aria-invalid="false"
         aria-label="Input"
         class="pf-c-form-control"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-1"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
         readonly=""
         type="number"
         value="0"
@@ -462,7 +486,7 @@ exports[`numberInput renders disabled 1`] = `
         aria-disabled="true"
         aria-label="Minus"
         class="pf-c-button pf-m-control pf-m-disabled"
-        data-ouia-component-id="OUIA-Generated-Button-control-5"
+        data-ouia-component-id="OUIA-Generated-Button-control-11"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         disabled=""
@@ -487,8 +511,12 @@ exports[`numberInput renders disabled 1`] = `
         </span>
       </button>
       <input
+        aria-invalid="false"
         aria-label="Input"
         class="pf-c-form-control"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-6"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
         disabled=""
         readonly=""
         type="number"
@@ -498,7 +526,7 @@ exports[`numberInput renders disabled 1`] = `
         aria-disabled="true"
         aria-label="Plus"
         class="pf-c-button pf-m-control pf-m-disabled"
-        data-ouia-component-id="OUIA-Generated-Button-control-6"
+        data-ouia-component-id="OUIA-Generated-Button-control-12"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         disabled=""
@@ -527,6 +555,162 @@ exports[`numberInput renders disabled 1`] = `
 </DocumentFragment>
 `;
 
+exports[`numberInput renders error validated 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-c-number-input pf-m-status"
+  >
+    <div
+      class="pf-c-input-group"
+    >
+      <button
+        aria-disabled="false"
+        aria-label="Minus"
+        class="pf-c-button pf-m-control"
+        data-ouia-component-id="OUIA-Generated-Button-control-5"
+        data-ouia-component-type="PF4/Button"
+        data-ouia-safe="true"
+        type="button"
+      >
+        <span
+          class="pf-c-number-input__icon"
+        >
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 448 512"
+            width="1em"
+          >
+            <path
+              d="M416 208H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h384c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z"
+            />
+          </svg>
+        </span>
+      </button>
+      <input
+        aria-invalid="true"
+        aria-label="Input"
+        class="pf-c-form-control"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-3"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
+        readonly=""
+        type="number"
+        value="0"
+      />
+      <button
+        aria-disabled="false"
+        aria-label="Plus"
+        class="pf-c-button pf-m-control"
+        data-ouia-component-id="OUIA-Generated-Button-control-6"
+        data-ouia-component-type="PF4/Button"
+        data-ouia-safe="true"
+        type="button"
+      >
+        <span
+          class="pf-c-number-input__icon"
+        >
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 448 512"
+            width="1em"
+          >
+            <path
+              d="M416 208H272V64c0-17.67-14.33-32-32-32h-32c-17.67 0-32 14.33-32 32v144H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h144v144c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32V304h144c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z"
+            />
+          </svg>
+        </span>
+      </button>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`numberInput renders success validated 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-c-number-input pf-m-status"
+  >
+    <div
+      class="pf-c-input-group"
+    >
+      <button
+        aria-disabled="false"
+        aria-label="Minus"
+        class="pf-c-button pf-m-control"
+        data-ouia-component-id="OUIA-Generated-Button-control-3"
+        data-ouia-component-type="PF4/Button"
+        data-ouia-safe="true"
+        type="button"
+      >
+        <span
+          class="pf-c-number-input__icon"
+        >
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 448 512"
+            width="1em"
+          >
+            <path
+              d="M416 208H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h384c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z"
+            />
+          </svg>
+        </span>
+      </button>
+      <input
+        aria-invalid="false"
+        aria-label="Input"
+        class="pf-c-form-control pf-m-success"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-2"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
+        readonly=""
+        type="number"
+        value="0"
+      />
+      <button
+        aria-disabled="false"
+        aria-label="Plus"
+        class="pf-c-button pf-m-control"
+        data-ouia-component-id="OUIA-Generated-Button-control-4"
+        data-ouia-component-type="PF4/Button"
+        data-ouia-safe="true"
+        type="button"
+      >
+        <span
+          class="pf-c-number-input__icon"
+        >
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 448 512"
+            width="1em"
+          >
+            <path
+              d="M416 208H272V64c0-17.67-14.33-32-32-32h-32c-17.67 0-32 14.33-32 32v144H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h144v144c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32V304h144c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z"
+            />
+          </svg>
+        </span>
+      </button>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
 exports[`numberInput renders unit & position 1`] = `
 <DocumentFragment>
   <div
@@ -544,7 +728,7 @@ exports[`numberInput renders unit & position 1`] = `
         aria-disabled="false"
         aria-label="Minus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-13"
+        data-ouia-component-id="OUIA-Generated-Button-control-19"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -568,8 +752,12 @@ exports[`numberInput renders unit & position 1`] = `
         </span>
       </button>
       <input
+        aria-invalid="false"
         aria-label="Input"
         class="pf-c-form-control"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-10"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
         readonly=""
         type="number"
         value="5"
@@ -578,7 +766,7 @@ exports[`numberInput renders unit & position 1`] = `
         aria-disabled="false"
         aria-label="Plus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-14"
+        data-ouia-component-id="OUIA-Generated-Button-control-20"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -618,7 +806,7 @@ exports[`numberInput renders unit 1`] = `
         aria-disabled="false"
         aria-label="Minus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-11"
+        data-ouia-component-id="OUIA-Generated-Button-control-17"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -642,8 +830,12 @@ exports[`numberInput renders unit 1`] = `
         </span>
       </button>
       <input
+        aria-invalid="false"
         aria-label="Input"
         class="pf-c-form-control"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-9"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
         readonly=""
         type="number"
         value="5"
@@ -652,7 +844,7 @@ exports[`numberInput renders unit 1`] = `
         aria-disabled="false"
         aria-label="Plus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-12"
+        data-ouia-component-id="OUIA-Generated-Button-control-18"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -697,7 +889,7 @@ exports[`numberInput renders value 1`] = `
         aria-disabled="false"
         aria-label="Minus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-3"
+        data-ouia-component-id="OUIA-Generated-Button-control-9"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -721,8 +913,12 @@ exports[`numberInput renders value 1`] = `
         </span>
       </button>
       <input
+        aria-invalid="false"
         aria-label="Input"
         class="pf-c-form-control"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-5"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
         readonly=""
         type="number"
         value="90"
@@ -731,7 +927,85 @@ exports[`numberInput renders value 1`] = `
         aria-disabled="false"
         aria-label="Plus"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-4"
+        data-ouia-component-id="OUIA-Generated-Button-control-10"
+        data-ouia-component-type="PF4/Button"
+        data-ouia-safe="true"
+        type="button"
+      >
+        <span
+          class="pf-c-number-input__icon"
+        >
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 448 512"
+            width="1em"
+          >
+            <path
+              d="M416 208H272V64c0-17.67-14.33-32-32-32h-32c-17.67 0-32 14.33-32 32v144H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h144v144c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32V304h144c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z"
+            />
+          </svg>
+        </span>
+      </button>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`numberInput renders warning validated 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-c-number-input pf-m-status"
+  >
+    <div
+      class="pf-c-input-group"
+    >
+      <button
+        aria-disabled="false"
+        aria-label="Minus"
+        class="pf-c-button pf-m-control"
+        data-ouia-component-id="OUIA-Generated-Button-control-7"
+        data-ouia-component-type="PF4/Button"
+        data-ouia-safe="true"
+        type="button"
+      >
+        <span
+          class="pf-c-number-input__icon"
+        >
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 448 512"
+            width="1em"
+          >
+            <path
+              d="M416 208H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h384c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z"
+            />
+          </svg>
+        </span>
+      </button>
+      <input
+        aria-invalid="false"
+        aria-label="Input"
+        class="pf-c-form-control pf-m-warning"
+        data-ouia-component-id="OUIA-Generated-TextInputBase-4"
+        data-ouia-component-type="PF4/TextInput"
+        data-ouia-safe="true"
+        readonly=""
+        type="number"
+        value="0"
+      />
+      <button
+        aria-disabled="false"
+        aria-label="Plus"
+        class="pf-c-button pf-m-control"
+        data-ouia-component-id="OUIA-Generated-Button-control-8"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
diff --git a/packages/react-core/src/components/NumberInput/examples/NumberInput.md b/packages/react-core/src/components/NumberInput/examples/NumberInput.md
index 0234f437191..dec8b098ab3 100644
--- a/packages/react-core/src/components/NumberInput/examples/NumberInput.md
+++ b/packages/react-core/src/components/NumberInput/examples/NumberInput.md
@@ -270,6 +270,11 @@ class DisabledNumberInput extends React.Component {
     );
   }
 }
+
+```
+### With status
+
+```ts file="./WithStatus.tsx"
 ```
 
 ### Varying sizes
diff --git a/packages/react-core/src/components/NumberInput/examples/WithStatus.tsx b/packages/react-core/src/components/NumberInput/examples/WithStatus.tsx
new file mode 100644
index 00000000000..88584de1ab2
--- /dev/null
+++ b/packages/react-core/src/components/NumberInput/examples/WithStatus.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import { NumberInput, ValidatedOptions } from '@patternfly/react-core';
+
+export const WithStatus: React.FunctionComponent = () => {
+  const max = 10;
+  const min = 0;
+
+  const [validated, setValidated] = React.useState<ValidatedOptions>(ValidatedOptions.success);
+  const [value, setValue] = React.useReducer((state, newVal) => Math.max(min, Math.min(max, Number(newVal))), 5);
+
+  const onPlus = () => {
+    const newVal = value + 1;
+    setValue(newVal);
+    validate(newVal);
+  };
+
+  const onMinus = () => {
+    const newVal = value - 1;
+    setValue(newVal);
+    validate(newVal);
+  };
+
+  const onChange = event => {
+    const newVal = isNaN(event.target.value) ? 5 : Number(event.target.value);
+    setValue(newVal);
+    validate(newVal);
+  };
+
+  const validate = newVal => {
+    const diff = Math.abs(5 - newVal);
+    if (diff > 3) {
+      setValidated(ValidatedOptions.error);
+    } else if (diff > 1) {
+      setValidated(ValidatedOptions.warning);
+    } else {
+      setValidated(ValidatedOptions.success);
+    }
+  };
+  return (
+    <>
+      In the following example, the validated status will update based on the value of the number input and how far from
+      the number 5 it is.
+      <br />
+      <NumberInput
+        validated={validated}
+        value={value}
+        min={0}
+        max={10}
+        onMinus={onMinus}
+        onPlus={onPlus}
+        onChange={onChange}
+        inputName="input"
+        inputAriaLabel="number input"
+        minusBtnAriaLabel="minus"
+        plusBtnAriaLabel="plus"
+      />
+    </>
+  );
+};