diff --git a/packages/react-core/src/components/InputGroup/InputGroup.tsx b/packages/react-core/src/components/InputGroup/InputGroup.tsx
index 0dd3c7bc27e..dac2c5f5559 100644
--- a/packages/react-core/src/components/InputGroup/InputGroup.tsx
+++ b/packages/react-core/src/components/InputGroup/InputGroup.tsx
@@ -15,7 +15,7 @@ export interface InputGroupProps extends React.HTMLProps<HTMLDivElement> {
 }
 
 export const InputGroupBase: React.FunctionComponent<InputGroupProps> = ({
-  className = '',
+  className,
   children,
   innerRef,
   ...props
diff --git a/packages/react-core/src/components/InputGroup/InputGroupItem.tsx b/packages/react-core/src/components/InputGroup/InputGroupItem.tsx
index f3d4ebb205c..2426a5d9e7d 100644
--- a/packages/react-core/src/components/InputGroup/InputGroupItem.tsx
+++ b/packages/react-core/src/components/InputGroup/InputGroupItem.tsx
@@ -15,11 +15,10 @@ export interface InputGroupItemProps extends React.HTMLProps<HTMLDivElement> {
   isFill?: boolean;
   /** Flag to indicate if the input group item is disabled. */
   isDisabled?: boolean;
-
 }
 
 export const InputGroupItem: React.FunctionComponent<InputGroupItemProps> = ({
-  className = '',
+  className,
   children,
   isFill = false,
   isBox = false,
diff --git a/packages/react-core/src/components/InputGroup/InputGroupText.tsx b/packages/react-core/src/components/InputGroup/InputGroupText.tsx
index 22b34fc8a46..7b3ac759110 100644
--- a/packages/react-core/src/components/InputGroup/InputGroupText.tsx
+++ b/packages/react-core/src/components/InputGroup/InputGroupText.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/InputGroup/input-group';
 import { css } from '@patternfly/react-styles';
+import { InputGroupItem } from './InputGroupItem';
 
 export interface InputGroupTextProps extends React.HTMLProps<HTMLSpanElement | HTMLLabelElement> {
   /** Additional classes added to the input group text. */
@@ -9,25 +10,27 @@ export interface InputGroupTextProps extends React.HTMLProps<HTMLSpanElement | H
   children: React.ReactNode;
   /** Component that wraps the input group text. */
   component?: React.ReactNode;
+  /** Flag to to indicate if the input group item is plain. */
+  isPlain?: boolean;
+  /** Flag to indicate if the input group text is disabled. */
+  isDisabled?: boolean;
 }
 
 export const InputGroupText: React.FunctionComponent<InputGroupTextProps> = ({
-  className = '',
+  className,
   component = 'span',
   children,
+  isPlain,
+  isDisabled,
   ...props
 }: InputGroupTextProps) => {
   const Component = component as any;
   return (
-    <Component
-      className={css(
-        styles.inputGroupText,
-        className
-      )}
-      {...props}
-    >
-      {children}
-    </Component>
+    <InputGroupItem isPlain={isPlain} isBox isDisabled={isDisabled}>
+      <Component className={css(styles.inputGroupText, className)} {...props}>
+        {children}
+      </Component>
+    </InputGroupItem>
   );
 };
 InputGroupText.displayName = 'InputGroupText';
diff --git a/packages/react-core/src/components/InputGroup/examples/InputGroupBasic.tsx b/packages/react-core/src/components/InputGroup/examples/InputGroupBasic.tsx
index 08378fd11e3..c2db8ff8e3e 100644
--- a/packages/react-core/src/components/InputGroup/examples/InputGroupBasic.tsx
+++ b/packages/react-core/src/components/InputGroup/examples/InputGroupBasic.tsx
@@ -1,12 +1,6 @@
 import React from 'react';
 import AtIcon from '@patternfly/react-icons/dist/esm/icons/at-icon';
-import {
-  InputGroup,
-  InputGroupText,
-  InputGroupItem,
-  TextInput,
-  ValidatedOptions
-} from '@patternfly/react-core';
+import { InputGroup, InputGroupText, InputGroupItem, TextInput, ValidatedOptions } from '@patternfly/react-core';
 
 export const InputGroupBasic: React.FunctionComponent = () => (
   <React.Fragment>
@@ -14,17 +8,13 @@ export const InputGroupBasic: React.FunctionComponent = () => (
       <InputGroupItem isFill>
         <TextInput id="textInput-basic-1" type="email" aria-label="email input field" />
       </InputGroupItem>
-      <InputGroupItem isBox>
-        <InputGroupText id="email-example">@example.com</InputGroupText>
-      </InputGroupItem>
+      <InputGroupText id="email-example">@example.com</InputGroupText>
     </InputGroup>
     <br />
     <InputGroup>
-      <InputGroupItem isBox>
-        <InputGroupText id="username">
-          <AtIcon />
-        </InputGroupText>
-      </InputGroupItem>
+      <InputGroupText id="username">
+        <AtIcon />
+      </InputGroupText>
       <InputGroupItem isFill>
         <TextInput
           validated={ValidatedOptions.error}
@@ -39,11 +29,9 @@ export const InputGroupBasic: React.FunctionComponent = () => (
       <InputGroupItem isFill>
         <TextInput name="textInput-basic-3" id="textInput-basic-3" type="text" aria-label="percentage" />
       </InputGroupItem>
-      <InputGroupItem isPlain isBox>
-        <InputGroupText id="plain-example">
-          %
-        </InputGroupText>
-      </InputGroupItem>
+      <InputGroupText id="plain-example" isPlain>
+        %
+      </InputGroupText>
     </InputGroup>
   </React.Fragment>
 );
diff --git a/packages/react-core/src/components/InputGroup/examples/InputGroupWithSiblings.tsx b/packages/react-core/src/components/InputGroup/examples/InputGroupWithSiblings.tsx
index 213d19c2bef..1a3ff7bc887 100644
--- a/packages/react-core/src/components/InputGroup/examples/InputGroupWithSiblings.tsx
+++ b/packages/react-core/src/components/InputGroup/examples/InputGroupWithSiblings.tsx
@@ -1,13 +1,6 @@
 import React from 'react';
 import DollarSignIcon from '@patternfly/react-icons/dist/esm/icons/dollar-sign-icon';
-import {
-  Button,
-  TextArea,
-  InputGroup,
-  InputGroupText,
-  InputGroupItem,
-  TextInput,
-} from '@patternfly/react-core';
+import { Button, TextArea, InputGroup, InputGroupText, InputGroupItem, TextInput } from '@patternfly/react-core';
 
 export const InputGroupWithSiblings: React.FunctionComponent = () => (
   <React.Fragment>
@@ -18,11 +11,7 @@ export const InputGroupWithSiblings: React.FunctionComponent = () => (
         </Button>
       </InputGroupItem>
       <InputGroupItem isFill>
-        <TextArea
-          name="textarea1"
-          id="textarea1"
-          aria-label="textarea with buttons"
-        />
+        <TextArea name="textarea1" id="textarea1" aria-label="textarea with buttons" />
       </InputGroupItem>
       <InputGroupItem>
         <Button variant="control">Button</Button>
@@ -39,11 +28,7 @@ export const InputGroupWithSiblings: React.FunctionComponent = () => (
         <Button variant="control">Button</Button>
       </InputGroupItem>
       <InputGroupItem isFill>
-        <TextArea
-          name="textarea2"
-          id="textarea2"
-          aria-label="textarea with 3 buttons"
-        />
+        <TextArea name="textarea2" id="textarea2" aria-label="textarea with 3 buttons" />
       </InputGroupItem>
       <InputGroupItem>
         <Button variant="control">Button</Button>
@@ -51,11 +36,9 @@ export const InputGroupWithSiblings: React.FunctionComponent = () => (
     </InputGroup>
     <br />
     <InputGroup>
-      <InputGroupItem isBox>
-        <InputGroupText>
-          <DollarSignIcon />
-        </InputGroupText>
-      </InputGroupItem>
+      <InputGroupText>
+        <DollarSignIcon />
+      </InputGroupText>
       <InputGroupItem isFill>
         <TextInput
           id="textInput-with-siblings"
@@ -64,9 +47,7 @@ export const InputGroupWithSiblings: React.FunctionComponent = () => (
           aria-label="Dollar amount input example"
         />
       </InputGroupItem>
-      <InputGroupItem isBox>
-        <InputGroupText>.00</InputGroupText>
-      </InputGroupItem>
+      <InputGroupText>.00</InputGroupText>
     </InputGroup>
   </React.Fragment>
 );
diff --git a/packages/react-core/src/components/InputGroup/index.ts b/packages/react-core/src/components/InputGroup/index.ts
index a14b2b665db..afa16b47f60 100644
--- a/packages/react-core/src/components/InputGroup/index.ts
+++ b/packages/react-core/src/components/InputGroup/index.ts
@@ -1,3 +1,3 @@
 export * from './InputGroup';
-export * from './InputGroupText';
 export * from './InputGroupItem';
+export * from './InputGroupText';
diff --git a/packages/react-core/src/components/Slider/Slider.tsx b/packages/react-core/src/components/Slider/Slider.tsx
index 4b8472ac1f3..f5e48ae0244 100644
--- a/packages/react-core/src/components/Slider/Slider.tsx
+++ b/packages/react-core/src/components/Slider/Slider.tsx
@@ -333,13 +333,7 @@ export const Slider: React.FunctionComponent<SliderProps> = ({
       return (
         <InputGroup>
           <InputGroupItem isFill>{textInput}</InputGroupItem>
-          <InputGroupItem isBox>
-            <InputGroupText
-              {...(isDisabled && { className: css(styles.modifiers.disabled) })}
-            >
-              {inputLabel}
-            </InputGroupText>
-          </InputGroupItem>
+          <InputGroupText isDisabled={isDisabled}>{inputLabel}</InputGroupText>
         </InputGroup>
       );
     } else {
diff --git a/packages/react-integration/cypress/integration/inputgroup.spec.ts b/packages/react-integration/cypress/integration/inputgroup.spec.ts
index 26184be0d36..24d94686e76 100644
--- a/packages/react-integration/cypress/integration/inputgroup.spec.ts
+++ b/packages/react-integration/cypress/integration/inputgroup.spec.ts
@@ -2,10 +2,6 @@ describe('Input Group Demo Test', () => {
   it('Navigate to demo section', () => {
     cy.visit('http://localhost:3000/input-group-demo-nav-link');
   });
-  it.skip('Verify text input', () => {
-    cy.get('#textarea1').type('Hi');
-    cy.get('#textarea1').should('have.value', 'Hi');
-  });
 
   it('Verify number input only allows numbers', () => {
     const text = cy.get('#textInput5');
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/InputGroupDemo/InputGroupDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/InputGroupDemo/InputGroupDemo.tsx
index 12652628a2d..00f54a66816 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/InputGroupDemo/InputGroupDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/InputGroupDemo/InputGroupDemo.tsx
@@ -128,17 +128,13 @@ export class InputGroupDemo extends React.Component<{}, InputGroupState> {
         <br />
         <br />
         <InputGroup>
-          <InputGroupItem>
-            <InputGroupText>
-              <DollarSignIcon />
-            </InputGroupText>
-          </InputGroupItem>
+          <InputGroupText>
+            <DollarSignIcon />
+          </InputGroupText>
           <InputGroupItem isFill>
             <TextInput id="textInput5" type="number" aria-label="Dollar amount input example" />
           </InputGroupItem>
-          <InputGroupItem>
-            <InputGroupText>.00</InputGroupText>
-          </InputGroupItem>
+          <InputGroupText>.00</InputGroupText>
         </InputGroup>
         <br />
         <br />
@@ -146,18 +142,14 @@ export class InputGroupDemo extends React.Component<{}, InputGroupState> {
           <InputGroupItem isFill>
             <TextInput id="textInput6" type="email" aria-label="email input field" />
           </InputGroupItem>
-          <InputGroupItem isBox>
-            <InputGroupText id="email-example">@example.com</InputGroupText>
-          </InputGroupItem>
+          <InputGroupText id="email-example">@example.com</InputGroupText>
         </InputGroup>
         <br />
         <br />
         <InputGroup>
-          <InputGroupItem isBox>
-            <InputGroupText id="username" aria-label="@">
-              <AtIcon />
-            </InputGroupText>
-          </InputGroupItem>
+          <InputGroupText id="username" aria-label="@">
+            <AtIcon />
+          </InputGroupText>
           <InputGroupItem isFill>
             <TextInput
               validated={ValidatedOptions.error}
@@ -170,11 +162,9 @@ export class InputGroupDemo extends React.Component<{}, InputGroupState> {
         <br />
         <br />
         <InputGroup>
-          <InputGroupItem>
-            <InputGroupText component="label" htmlFor="textInput9">
-              <CalendarAltIcon />
-            </InputGroupText>
-          </InputGroupItem>
+          <InputGroupText component="label" htmlFor="textInput9">
+            <CalendarAltIcon />
+          </InputGroupText>
           <InputGroupItem>
             <TextInput name="textInput9" id="textInput9" type="date" aria-label="Date input example" />
           </InputGroupItem>
@@ -215,11 +205,9 @@ export class InputGroupDemo extends React.Component<{}, InputGroupState> {
           <InputGroupItem isFill>
             <TextInput name="textIndex12" id="textInput12" type="text" aria-label="percentage" />
           </InputGroupItem>
-          <InputGroupItem isPlain isBox>
-            <InputGroupText id="plain-example">
-              %
-            </InputGroupText>
-          </InputGroupItem>
+          <InputGroupText isPlain id="plain-example">
+            %
+          </InputGroupText>
         </InputGroup>
       </React.Fragment>
     );