diff --git a/packages/react-core/src/components/ProgressStepper/ProgressStep.tsx b/packages/react-core/src/components/ProgressStepper/ProgressStep.tsx
index 94aef5ecd2c..a0882eaf178 100644
--- a/packages/react-core/src/components/ProgressStepper/ProgressStep.tsx
+++ b/packages/react-core/src/components/ProgressStepper/ProgressStep.tsx
@@ -6,6 +6,15 @@ import ResourcesFullIcon from '@patternfly/react-icons/dist/esm/icons/resources-
 import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 
+export enum ProgressStepVariant {
+  default = 'default',
+  pending = 'pending',
+  success = 'success',
+  info = 'info',
+  danger = 'danger',
+  warning = 'warning'
+}
+
 export interface ProgressStepProps
   extends React.DetailedHTMLProps<React.LiHTMLAttributes<HTMLLIElement>, HTMLLIElement> {
   /** Content rendered inside the progress step. */
diff --git a/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStep.test.tsx b/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStep.test.tsx
new file mode 100644
index 00000000000..1a754ce82af
--- /dev/null
+++ b/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStep.test.tsx
@@ -0,0 +1,178 @@
+import * as React from 'react';
+import { render, screen } from '@testing-library/react';
+import { ProgressStep, ProgressStepVariant } from '../ProgressStep';
+import { capitalize } from '../../../helpers';
+
+jest.mock('@patternfly/react-icons/dist/esm/icons/check-circle-icon', () => () => 'Success icon mock');
+jest.mock('@patternfly/react-icons/dist/esm/icons/resources-full-icon', () => () => 'Info icon mock');
+jest.mock('@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon', () => () => 'Warning icon mock');
+jest.mock('@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon', () => () => 'Danger icon mock');
+
+test('Renders without children', () => {
+  render(
+    <div data-testid="progress-step">
+      <ProgressStep />
+    </div>
+  );
+
+  expect(screen.getByTestId('progress-step').firstChild).toBeVisible();
+});
+
+test('Renders children', () => {
+  render(<ProgressStep>Test</ProgressStep>);
+  expect(screen.getByText('Test')).toBeVisible();
+});
+
+test('Renders with class pf-c-progress-stepper__step on the containing li element', () => {
+  render(<ProgressStep>Test</ProgressStep>);
+  expect(screen.getByRole('listitem')).toHaveClass('pf-c-progress-stepper__step');
+});
+
+test('Renders with custom class name on the containing li element when className prop is provided', () => {
+  render(<ProgressStep className="custom-class">Test</ProgressStep>);
+  expect(screen.getByRole('listitem')).toHaveClass('custom-class');
+});
+
+['default', undefined].forEach(variant => {
+  test(`Renders with no additional classes when variant=${variant} on containing li element`, () => {
+    render(<ProgressStep variant={`${variant as ProgressStepVariant}`}>Test</ProgressStep>);
+    expect(screen.getByRole('listitem')).toHaveClass('pf-c-progress-stepper__step', { exact: true });
+  });
+});
+
+['success', 'info', 'warning', 'danger'].forEach(variant => {
+  test(`Does not render with class pf-m-${variant} by default on containing li element`, () => {
+    render(<ProgressStep>Test</ProgressStep>);
+    expect(screen.getByRole('listitem')).not.toHaveClass(`pf-m-${variant}`);
+  });
+
+  test(`Renders with class pf-m-${variant} when variant = ${variant} on containing li element`, () => {
+    render(<ProgressStep variant={`${variant as ProgressStepVariant}`}>Test</ProgressStep>);
+    expect(screen.getByRole('listitem')).toHaveClass(`pf-m-${variant}`);
+  });
+
+  test(`Does not render with ${variant} variant icon by default`, () => {
+    render(<ProgressStep>Test</ProgressStep>);
+    expect(screen.queryByText(`${capitalize(variant)} icon mock`)).not.toBeInTheDocument();
+  });
+
+  test(`Renders with ${variant} variant icon when variant = ${variant}`, () => {
+    render(<ProgressStep variant={`${variant as ProgressStepVariant}`}>Test</ProgressStep>);
+    expect(screen.getByText(`${capitalize(variant)} icon mock`)).toBeVisible();
+  });
+});
+
+test('Does not render with class pf-m-pending by default on containing li element', () => {
+  render(<ProgressStep>Test</ProgressStep>);
+  expect(screen.getByRole('listitem')).not.toHaveClass('pf-m-pending');
+});
+
+test('Renders with class pf-m-pending when variant = pending on containing li element', () => {
+  render(<ProgressStep variant="pending">Test</ProgressStep>);
+  expect(screen.getByRole('listitem')).toHaveClass('pf-m-pending');
+});
+
+test('Renders the element passed via the icon prop', () => {
+  render(<ProgressStep icon="Custom Icon">Test</ProgressStep>);
+  expect(screen.getByText('Custom Icon')).toBeVisible();
+});
+
+test('Renders the icon element inside span element with class pf-c-progress-stepper__step-icon', () => {
+  render(<ProgressStep icon="Custom Icon">Test</ProgressStep>);
+  expect(screen.getByText('Custom Icon')).toHaveClass('pf-c-progress-stepper__step-icon');
+});
+
+test('Does not render with class pf-m-current by default on containing li element', () => {
+  render(<ProgressStep>Test</ProgressStep>);
+  expect(screen.getByRole('listitem')).not.toHaveClass('pf-m-current');
+});
+
+test('Renders with class pf-m-current on containing li element when isCurrent is passed', () => {
+  render(<ProgressStep isCurrent>Test</ProgressStep>);
+  expect(screen.getByRole('listitem')).toHaveClass('pf-m-current');
+});
+
+test('Renders without aria-current on containing li element by default', () => {
+  render(<ProgressStep>Test</ProgressStep>);
+  expect(screen.getByRole('listitem')).not.toHaveAttribute('aria-current');
+});
+
+test(`Renders with a aria-current of "step" on containing li element when isCurrent is passed`, () => {
+  render(<ProgressStep isCurrent>Test</ProgressStep>);
+  expect(screen.getByRole('listitem')).toHaveAttribute('aria-current', 'step');
+});
+
+test(`Renders with the aria label on containing li element passed via prop`, () => {
+  render(<ProgressStep aria-label="Test label">Test</ProgressStep>);
+  expect(screen.getByRole('listitem')).toHaveAccessibleName('Test label');
+});
+
+test('Renders the element passed via the description prop', () => {
+  render(<ProgressStep description={<button>Description</button>}>Test</ProgressStep>);
+  expect(screen.getByRole('button', { name: 'Description' })).toBeVisible();
+});
+
+test('Renders the description element inside div element with class pf-c-progress-stepper__step-description', () => {
+  render(<ProgressStep description="Description">Test</ProgressStep>);
+  expect(screen.getByText('Description')).toHaveClass('pf-c-progress-stepper__step-description');
+});
+
+test('Renders children inside class pf-c-progress-stepper__step-title', () => {
+  render(<ProgressStep>Test</ProgressStep>);
+  expect(screen.getByText('Test')).toHaveClass('pf-c-progress-stepper__step-title');
+});
+
+test('Renders Component element as div by default', () => {
+  render(<ProgressStep>Test</ProgressStep>);
+  expect(screen.getByText('Test')).toHaveProperty('nodeName', 'DIV');
+});
+
+test('Renders Component element as button when popoverRender is defined', () => {
+  render(<ProgressStep popoverRender={() => <div>Popover</div>}>Test</ProgressStep>);
+  expect(screen.getByRole('button')).toBeVisible();
+});
+
+test('Does not render with class pf-m-help-text by default on Component element', () => {
+  render(<ProgressStep>Test</ProgressStep>);
+  expect(screen.getByText('Test')).not.toHaveClass('pf-m-help-text');
+});
+
+test('Renders with class pf-m-help-text when popoverRender is defined', () => {
+  render(<ProgressStep popoverRender={() => <div>Popover</div>}>Test</ProgressStep>);
+  expect(screen.getByText('Test')).toHaveClass('pf-m-help-text');
+});
+
+test('Does not renders with aria-labelledBy by default on Component element', () => {
+  render(<ProgressStep>Test</ProgressStep>);
+  expect(screen.getByText('Test')).not.toHaveAccessibleName();
+});
+
+test('Renders with an accessible name that matches children', () => {
+  render(
+    <ProgressStep id="test-id" titleId="title-id">
+      Test
+    </ProgressStep>
+  );
+  expect(screen.getByText('Test')).toHaveAccessibleName('Test');
+});
+
+test('Renders with popoverRender element', () => {
+  render(<ProgressStep popoverRender={() => <div>Popover</div>}>Test</ProgressStep>);
+  expect(screen.getByText('Popover')).toBeVisible();
+});
+
+test('Renders with inherited element props spread to the component', () => {
+  render(
+    <>
+      <ProgressStep aria-describedby="labelling-id" aria-label="Test label" />
+      <p id="labelling-id">Described by text</p>
+    </>
+  );
+
+  expect(screen.getByLabelText('Test label')).toHaveAccessibleDescription('Described by text');
+});
+
+test('Matches snapshot', () => {
+  const { asFragment } = render(<ProgressStep>Test</ProgressStep>);
+  expect(asFragment()).toMatchSnapshot();
+});
diff --git a/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStepper.test.tsx b/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStepper.test.tsx
index 8c3b5b888a7..bf8f48f1251 100644
--- a/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStepper.test.tsx
+++ b/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStepper.test.tsx
@@ -1,143 +1,57 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ProgressStepper } from '../ProgressStepper';
-import { ProgressStep } from '../ProgressStep';
-import InProgressIcon from '@patternfly/react-icons/dist/esm/icons/in-progress-icon';
 
-describe('ProgressStepper', () => {
-  test('renders content', () => {
-    const { asFragment } = render(
-      <ProgressStepper>
-        <ProgressStep>First</ProgressStep>
-        <ProgressStep>Second</ProgressStep>
-        <ProgressStep>Third</ProgressStep>
-      </ProgressStepper>
-    );
-    expect(asFragment()).toMatchSnapshot();
-  });
-
-  test('gets custom class and id', () => {
-    const { asFragment } = render(
-      <ProgressStepper className="custom-class" id="test-id">
-        <ProgressStep>First</ProgressStep>
-        <ProgressStep>Second</ProgressStep>
-        <ProgressStep>Third</ProgressStep>
-      </ProgressStepper>
-    );
-    expect(asFragment()).toMatchSnapshot();
-  });
-
-  test('renders vertically', () => {
-    const { asFragment } = render(
-      <ProgressStepper isVertical>
-        <ProgressStep>First</ProgressStep>
-        <ProgressStep>Second</ProgressStep>
-        <ProgressStep>Third</ProgressStep>
-      </ProgressStepper>
-    );
-    expect(asFragment()).toMatchSnapshot();
-  });
-
-  test('renders compact', () => {
-    const { asFragment } = render(
-      <ProgressStepper isCompact>
-        <ProgressStep>First</ProgressStep>
-        <ProgressStep>Second</ProgressStep>
-        <ProgressStep>Third</ProgressStep>
-      </ProgressStepper>
-    );
-    expect(asFragment()).toMatchSnapshot();
-  });
-
-  test('renders center aligned', () => {
-    const { asFragment } = render(
-      <ProgressStepper isCenterAligned>
-        <ProgressStep>First</ProgressStep>
-        <ProgressStep>Second</ProgressStep>
-        <ProgressStep>Third</ProgressStep>
-      </ProgressStepper>
-    );
-    expect(asFragment()).toMatchSnapshot();
-  });
+test('Renders without children', () => {
+  render(
+    <div data-testid="progress-stepper">
+      <ProgressStepper />
+    </div>
+  );
+  expect(screen.getByTestId('progress-stepper').firstChild).toBeVisible();
 });
 
-describe('ProgressStep', () => {
-  test('renders content', () => {
-    const { asFragment } = render(<ProgressStep>Title</ProgressStep>);
-    expect(asFragment()).toMatchSnapshot();
-  });
-
-  Object.values(['default', 'success', 'info', 'pending', 'warning', 'danger']).forEach(variant => {
-    test(`renders ${variant} variant`, () => {
-      const { asFragment } = render(
-        <ProgressStep
-          variant={variant as 'default' | 'success' | 'info' | 'pending' | 'warning' | 'danger'}
-          aria-label={variant}
-        >
-          {variant} step
-        </ProgressStep>
-      );
-      expect(asFragment()).toMatchSnapshot();
-    });
-  });
-
-  test('renders current', () => {
-    const { asFragment } = render(<ProgressStep isCurrent>Title</ProgressStep>);
-    expect(asFragment()).toMatchSnapshot();
-  });
+test('Renders children', () => {
+  render(<ProgressStepper>Test</ProgressStepper>);
+  expect(screen.getByRole('list')).toBeVisible();
+});
 
-  test('renders help text styling', () => {
-    const { asFragment } = render(<ProgressStep popoverRender={() => <div></div>}>Title</ProgressStep>);
-    expect(asFragment()).toMatchSnapshot();
-  });
+test('Renders with only class name pf-c-progress-stepper by default', () => {
+  render(<ProgressStepper>Test</ProgressStepper>);
+  expect(screen.getByRole('list')).toHaveClass('pf-c-progress-stepper', { exact: true });
+});
 
-  test('renders custom icon', () => {
-    const { asFragment } = render(<ProgressStep icon={<InProgressIcon />}>Title</ProgressStep>);
-    expect(asFragment()).toMatchSnapshot();
-  });
+test('Renders with class name pf-c-progress-stepper', () => {
+  render(<ProgressStepper>Test</ProgressStepper>);
+  expect(screen.getByRole('list')).toHaveClass('pf-c-progress-stepper');
+});
 
-  test('renders custom null icon - removing default from variant', () => {
-    const { asFragment } = render(
-      <ProgressStep icon={null} variant="success">
-        Title
-      </ProgressStep>
-    );
-    expect(asFragment()).toMatchSnapshot();
-  });
+test('Renders with custom class name when className prop is provided', () => {
+  render(<ProgressStepper className="custom-class">Test</ProgressStepper>);
+  expect(screen.getByRole('list')).toHaveClass('custom-class');
+});
 
-  test('renders description', () => {
-    const { asFragment } = render(<ProgressStep description="This is a description">Title</ProgressStep>);
-    expect(asFragment()).toMatchSnapshot();
-  });
+test('Renders with class name pf-m-center when isCenterAligned prop is passed', () => {
+  render(<ProgressStepper isCenterAligned>Test</ProgressStepper>);
+  expect(screen.getByRole('list')).toHaveClass('pf-m-center');
 });
 
-test('renders description class and text', () => {
-  render(
-    <ProgressStep
-      description="Test description"
-    >
-      Title
-    </ProgressStep>
-  );
+test('Renders with class name pf-m-vertical when isVertical prop is passed', () => {
+  render(<ProgressStepper isVertical>Test</ProgressStepper>);
+  expect(screen.getByRole('list')).toHaveClass('pf-m-vertical');
+});
 
-  expect(screen.getByText('Test description')).toBeVisible();
-  expect(screen.getByText('Test description')).toHaveClass('pf-c-progress-stepper__step-description');
+test('Renders with class name pf-m-compact when isCompact prop is passed', () => {
+  render(<ProgressStepper isCompact>Test</ProgressStepper>);
+  expect(screen.getByRole('list')).toHaveClass('pf-m-compact');
 });
 
-test('renders description line break', () => {
-  render(
-    <ProgressStep
-      description={
-        <>
-          Testing description
-          <br />
-          Line break
-        </>
-      }
-      >
-        Title
-      </ProgressStep>
-  );
+test('Renders with inherited element props spread to the component', () => {
+  render(<ProgressStepper aria-label="Test label">Test</ProgressStepper>);
+  expect(screen.getByRole('list')).toHaveAccessibleName('Test label');
+});
 
-  expect(screen.getByText("Testing descriptionLine break")).toBeVisible();
+test('Matches the snapshot', () => {
+  const { asFragment } = render(<ProgressStepper>Test</ProgressStepper>);
+  expect(asFragment()).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/components/ProgressStepper/__tests__/__snapshots__/ProgressStep.test.tsx.snap b/packages/react-core/src/components/ProgressStepper/__tests__/__snapshots__/ProgressStep.test.tsx.snap
new file mode 100644
index 00000000000..b170147c393
--- /dev/null
+++ b/packages/react-core/src/components/ProgressStepper/__tests__/__snapshots__/ProgressStep.test.tsx.snap
@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Matches snapshot 1`] = `
+<DocumentFragment>
+  <li
+    class="pf-c-progress-stepper__step"
+  >
+    <div
+      class="pf-c-progress-stepper__step-connector"
+    >
+      <span
+        class="pf-c-progress-stepper__step-icon"
+      />
+    </div>
+    <div
+      class="pf-c-progress-stepper__step-main"
+    >
+      <div
+        class="pf-c-progress-stepper__step-title"
+      >
+        Test
+      </div>
+    </div>
+  </li>
+</DocumentFragment>
+`;
diff --git a/packages/react-core/src/components/ProgressStepper/__tests__/__snapshots__/ProgressStepper.test.tsx.snap b/packages/react-core/src/components/ProgressStepper/__tests__/__snapshots__/ProgressStepper.test.tsx.snap
index f766ec6d3e4..26bee948bf5 100644
--- a/packages/react-core/src/components/ProgressStepper/__tests__/__snapshots__/ProgressStepper.test.tsx.snap
+++ b/packages/react-core/src/components/ProgressStepper/__tests__/__snapshots__/ProgressStepper.test.tsx.snap
@@ -1,731 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ProgressStep renders content 1`] = `
-<DocumentFragment>
-  <li
-    class="pf-c-progress-stepper__step"
-  >
-    <div
-      class="pf-c-progress-stepper__step-connector"
-    >
-      <span
-        class="pf-c-progress-stepper__step-icon"
-      />
-    </div>
-    <div
-      class="pf-c-progress-stepper__step-main"
-    >
-      <div
-        class="pf-c-progress-stepper__step-title"
-      >
-        Title
-      </div>
-    </div>
-  </li>
-</DocumentFragment>
-`;
-
-exports[`ProgressStep renders current 1`] = `
-<DocumentFragment>
-  <li
-    aria-current="step"
-    class="pf-c-progress-stepper__step pf-m-current"
-  >
-    <div
-      class="pf-c-progress-stepper__step-connector"
-    >
-      <span
-        class="pf-c-progress-stepper__step-icon"
-      />
-    </div>
-    <div
-      class="pf-c-progress-stepper__step-main"
-    >
-      <div
-        class="pf-c-progress-stepper__step-title"
-      >
-        Title
-      </div>
-    </div>
-  </li>
-</DocumentFragment>
-`;
-
-exports[`ProgressStep renders custom icon 1`] = `
-<DocumentFragment>
-  <li
-    class="pf-c-progress-stepper__step"
-  >
-    <div
-      class="pf-c-progress-stepper__step-connector"
-    >
-      <span
-        class="pf-c-progress-stepper__step-icon"
-      >
-        <svg
-          aria-hidden="true"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          style="vertical-align: -0.125em;"
-          viewBox="0 0 1024 1024"
-          width="1em"
-        >
-          <path
-            d="M513.417211,16.013668 L513.417211,112.013668 C513.406007,120.539653 520.082422,127.576718 528.597211,128.013668 C732.697211,136.513668 896.147211,305.013668 896.147211,511.343668 C896.147211,723.013668 724.007211,895.163668 512.417211,895.163668 C437.186239,895.277345 363.602574,873.135095 300.927211,831.523668 C294.58293,827.2982 286.138663,828.135095 280.747211,833.523668 L211.807211,902.353668 C208.502935,905.676185 206.82123,910.280199 207.20607,914.950237 C207.590911,919.620275 210.00361,923.886884 213.807211,926.623668 C300.709573,989.398037 405.213535,1023.13146 512.417211,1023.01398 C794.537211,1023.01398 1023.91724,793.433668 1023.91724,511.413668 C1024.00721,235.103668 804.007211,9.22366802 529.897211,0.00645736761 C525.571205,-0.116171039 521.377128,1.51204372 518.271915,4.52681369 C515.166702,7.54158367 513.415263,11.6857144 513.417211,16.013668 M97.1272107,212.923668 C64.2190689,258.479443 39.0698895,309.162997 22.6972107,362.923668 C21.2705092,367.756559 22.2039184,372.979173 25.2163356,377.018685 C28.2287528,381.058197 32.9681443,383.442545 38.0072107,383.453683 L139.407211,383.453683 C145.970195,383.46249 151.873012,379.462528 154.297211,373.363668 C164.307669,347.593304 177.068112,322.977652 192.357211,299.943668 C196.579666,293.633658 195.741339,285.216847 190.357211,279.863668 L121.497211,211.013668 C118.186635,207.662531 113.567544,205.940538 108.871166,206.30669 C104.174788,206.672841 99.8783994,209.089927 97.1272107,212.913668 M112.907211,511.433663 L17.0072107,511.433663 C12.679257,511.433663 8.5351263,513.183159 5.52035633,516.288373 C2.50558635,519.393586 0.877371594,523.587662 1.00721065,527.913668 C4.13104542,629.408217 37.6085847,727.635936 97.1172107,809.913668 C99.8539943,813.717268 104.120603,816.129968 108.790642,816.514809 C113.46068,816.899649 118.064693,815.217944 121.387211,811.913668 L190.217211,743.073668 C195.605784,737.682216 196.442679,729.237949 192.217211,722.893668 C153.520825,664.580171 131.611534,596.745437 128.887211,526.813668 C128.553964,518.220138 121.487197,511.427209 112.887211,511.433663"
-          />
-        </svg>
-      </span>
-    </div>
-    <div
-      class="pf-c-progress-stepper__step-main"
-    >
-      <div
-        class="pf-c-progress-stepper__step-title"
-      >
-        Title
-      </div>
-    </div>
-  </li>
-</DocumentFragment>
-`;
-
-exports[`ProgressStep renders custom null icon - removing default from variant 1`] = `
-<DocumentFragment>
-  <li
-    class="pf-c-progress-stepper__step pf-m-success"
-  >
-    <div
-      class="pf-c-progress-stepper__step-connector"
-    >
-      <span
-        class="pf-c-progress-stepper__step-icon"
-      />
-    </div>
-    <div
-      class="pf-c-progress-stepper__step-main"
-    >
-      <div
-        class="pf-c-progress-stepper__step-title"
-      >
-        Title
-      </div>
-    </div>
-  </li>
-</DocumentFragment>
-`;
-
-exports[`ProgressStep renders danger variant 1`] = `
-<DocumentFragment>
-  <li
-    aria-label="danger"
-    class="pf-c-progress-stepper__step pf-m-danger"
-  >
-    <div
-      class="pf-c-progress-stepper__step-connector"
-    >
-      <span
-        class="pf-c-progress-stepper__step-icon"
-      >
-        <svg
-          aria-hidden="true"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          style="vertical-align: -0.125em;"
-          viewBox="0 0 512 512"
-          width="1em"
-        >
-          <path
-            d="M504 256c0 136.997-111.043 248-248 248S8 392.997 8 256C8 119.083 119.043 8 256 8s248 111.083 248 248zm-248 50c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
-          />
-        </svg>
-      </span>
-    </div>
-    <div
-      class="pf-c-progress-stepper__step-main"
-    >
-      <div
-        class="pf-c-progress-stepper__step-title"
-      >
-        danger step
-      </div>
-    </div>
-  </li>
-</DocumentFragment>
-`;
-
-exports[`ProgressStep renders default variant 1`] = `
-<DocumentFragment>
-  <li
-    aria-label="default"
-    class="pf-c-progress-stepper__step"
-  >
-    <div
-      class="pf-c-progress-stepper__step-connector"
-    >
-      <span
-        class="pf-c-progress-stepper__step-icon"
-      />
-    </div>
-    <div
-      class="pf-c-progress-stepper__step-main"
-    >
-      <div
-        class="pf-c-progress-stepper__step-title"
-      >
-        default step
-      </div>
-    </div>
-  </li>
-</DocumentFragment>
-`;
-
-exports[`ProgressStep renders description 1`] = `
-<DocumentFragment>
-  <li
-    class="pf-c-progress-stepper__step"
-  >
-    <div
-      class="pf-c-progress-stepper__step-connector"
-    >
-      <span
-        class="pf-c-progress-stepper__step-icon"
-      />
-    </div>
-    <div
-      class="pf-c-progress-stepper__step-main"
-    >
-      <div
-        class="pf-c-progress-stepper__step-title"
-      >
-        Title
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-description"
-      >
-        This is a description
-      </div>
-    </div>
-  </li>
-</DocumentFragment>
-`;
-
-exports[`ProgressStep renders help text styling 1`] = `
-<DocumentFragment>
-  <li
-    class="pf-c-progress-stepper__step"
-  >
-    <div
-      class="pf-c-progress-stepper__step-connector"
-    >
-      <span
-        class="pf-c-progress-stepper__step-icon"
-      />
-    </div>
-    <div
-      class="pf-c-progress-stepper__step-main"
-    >
-      <button
-        class="pf-c-progress-stepper__step-title pf-m-help-text"
-        type="button"
-      >
-        Title
-        <div />
-      </button>
-    </div>
-  </li>
-</DocumentFragment>
-`;
-
-exports[`ProgressStep renders info variant 1`] = `
-<DocumentFragment>
-  <li
-    aria-label="info"
-    class="pf-c-progress-stepper__step pf-m-info"
-  >
-    <div
-      class="pf-c-progress-stepper__step-connector"
-    >
-      <span
-        class="pf-c-progress-stepper__step-icon"
-      >
-        <svg
-          aria-hidden="true"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          style="vertical-align: -0.125em;"
-          viewBox="0 0 1024 1024"
-          width="1em"
-        >
-          <path
-            d="M512.1,0 C229.7,0 0,229.8 0,512 C0,794.3 229.8,1024 512.1,1024 C794.4,1024 1024,794.3 1024,512 C1024,229.7 794.4,0 512.1,0 Z M512,896 C300.2,896 128,723.9 128,512 C128,300.3 300.2,128 512,128 C723.7,128 896,300.2 896,512 C896,723.8 723.7,896 512,896 Z M512,224 C671.1,224 800,352.9 800,512 C800,671.1 671.1,800 512,800 C352.9,800 224,671.1 224,512 C224,352.9 352.9,224 512,224"
-          />
-        </svg>
-      </span>
-    </div>
-    <div
-      class="pf-c-progress-stepper__step-main"
-    >
-      <div
-        class="pf-c-progress-stepper__step-title"
-      >
-        info step
-      </div>
-    </div>
-  </li>
-</DocumentFragment>
-`;
-
-exports[`ProgressStep renders pending variant 1`] = `
-<DocumentFragment>
-  <li
-    aria-label="pending"
-    class="pf-c-progress-stepper__step pf-m-pending"
-  >
-    <div
-      class="pf-c-progress-stepper__step-connector"
-    >
-      <span
-        class="pf-c-progress-stepper__step-icon"
-      />
-    </div>
-    <div
-      class="pf-c-progress-stepper__step-main"
-    >
-      <div
-        class="pf-c-progress-stepper__step-title"
-      >
-        pending step
-      </div>
-    </div>
-  </li>
-</DocumentFragment>
-`;
-
-exports[`ProgressStep renders success variant 1`] = `
-<DocumentFragment>
-  <li
-    aria-label="success"
-    class="pf-c-progress-stepper__step pf-m-success"
-  >
-    <div
-      class="pf-c-progress-stepper__step-connector"
-    >
-      <span
-        class="pf-c-progress-stepper__step-icon"
-      >
-        <svg
-          aria-hidden="true"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          style="vertical-align: -0.125em;"
-          viewBox="0 0 512 512"
-          width="1em"
-        >
-          <path
-            d="M504 256c0 136.967-111.033 248-248 248S8 392.967 8 256 119.033 8 256 8s248 111.033 248 248zM227.314 387.314l184-184c6.248-6.248 6.248-16.379 0-22.627l-22.627-22.627c-6.248-6.249-16.379-6.249-22.628 0L216 308.118l-70.059-70.059c-6.248-6.248-16.379-6.248-22.628 0l-22.627 22.627c-6.248 6.248-6.248 16.379 0 22.627l104 104c6.249 6.249 16.379 6.249 22.628.001z"
-          />
-        </svg>
-      </span>
-    </div>
-    <div
-      class="pf-c-progress-stepper__step-main"
-    >
-      <div
-        class="pf-c-progress-stepper__step-title"
-      >
-        success step
-      </div>
-    </div>
-  </li>
-</DocumentFragment>
-`;
-
-exports[`ProgressStep renders warning variant 1`] = `
-<DocumentFragment>
-  <li
-    aria-label="warning"
-    class="pf-c-progress-stepper__step pf-m-warning"
-  >
-    <div
-      class="pf-c-progress-stepper__step-connector"
-    >
-      <span
-        class="pf-c-progress-stepper__step-icon"
-      >
-        <svg
-          aria-hidden="true"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          style="vertical-align: -0.125em;"
-          viewBox="0 0 576 512"
-          width="1em"
-        >
-          <path
-            d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
-          />
-        </svg>
-      </span>
-    </div>
-    <div
-      class="pf-c-progress-stepper__step-main"
-    >
-      <div
-        class="pf-c-progress-stepper__step-title"
-      >
-        warning step
-      </div>
-    </div>
-  </li>
-</DocumentFragment>
-`;
-
-exports[`ProgressStepper gets custom class and id 1`] = `
-<DocumentFragment>
-  <ol
-    class="pf-c-progress-stepper custom-class"
-    id="test-id"
-  >
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          First
-        </div>
-      </div>
-    </li>
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          Second
-        </div>
-      </div>
-    </li>
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          Third
-        </div>
-      </div>
-    </li>
-  </ol>
-</DocumentFragment>
-`;
-
-exports[`ProgressStepper renders center aligned 1`] = `
-<DocumentFragment>
-  <ol
-    class="pf-c-progress-stepper pf-m-center"
-  >
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          First
-        </div>
-      </div>
-    </li>
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          Second
-        </div>
-      </div>
-    </li>
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          Third
-        </div>
-      </div>
-    </li>
-  </ol>
-</DocumentFragment>
-`;
-
-exports[`ProgressStepper renders compact 1`] = `
-<DocumentFragment>
-  <ol
-    class="pf-c-progress-stepper pf-m-compact"
-  >
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          First
-        </div>
-      </div>
-    </li>
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          Second
-        </div>
-      </div>
-    </li>
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          Third
-        </div>
-      </div>
-    </li>
-  </ol>
-</DocumentFragment>
-`;
-
-exports[`ProgressStepper renders content 1`] = `
+exports[`Matches the snapshot 1`] = `
 <DocumentFragment>
   <ol
     class="pf-c-progress-stepper"
   >
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          First
-        </div>
-      </div>
-    </li>
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          Second
-        </div>
-      </div>
-    </li>
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          Third
-        </div>
-      </div>
-    </li>
-  </ol>
-</DocumentFragment>
-`;
-
-exports[`ProgressStepper renders vertically 1`] = `
-<DocumentFragment>
-  <ol
-    class="pf-c-progress-stepper pf-m-vertical"
-  >
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          First
-        </div>
-      </div>
-    </li>
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          Second
-        </div>
-      </div>
-    </li>
-    <li
-      class="pf-c-progress-stepper__step"
-    >
-      <div
-        class="pf-c-progress-stepper__step-connector"
-      >
-        <span
-          class="pf-c-progress-stepper__step-icon"
-        />
-      </div>
-      <div
-        class="pf-c-progress-stepper__step-main"
-      >
-        <div
-          class="pf-c-progress-stepper__step-title"
-        >
-          Third
-        </div>
-      </div>
-    </li>
+    Test
   </ol>
 </DocumentFragment>
 `;
diff --git a/packages/react-integration/cypress/integration/progressstepper.spec.ts b/packages/react-integration/cypress/integration/progressstepper.spec.ts
deleted file mode 100644
index 94dbae68ebe..00000000000
--- a/packages/react-integration/cypress/integration/progressstepper.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-describe('Progress Stepper Demo Test', () => {
-  it('Navigate to progress stepper section', () => {
-    cy.visit('http://localhost:3000/progress-stepper-demo-nav-link');
-  });
-
-  it('Display Progress stepper and launch popover', () => {
-    cy.get('#popover-step1-title').then((popoverLink: JQuery<HTMLDivElement>) => {
-      cy.get('.pf-c-popover').should('not.exist');
-      cy.wrap(popoverLink).click();
-      cy.get('.pf-c-popover').should('exist');
-      cy.get('button[aria-label="Close"]').then(closeBtn => {
-        cy.wrap(closeBtn).click();
-        cy.get('.pf-c-popover').should('not.exist');
-      });
-    });
-  });
-});
diff --git a/packages/react-integration/demo-app-ts/src/Demos.ts b/packages/react-integration/demo-app-ts/src/Demos.ts
index 6fbbe20ea56..9eae2346d0b 100644
--- a/packages/react-integration/demo-app-ts/src/Demos.ts
+++ b/packages/react-integration/demo-app-ts/src/Demos.ts
@@ -297,11 +297,6 @@ export const Demos: DemoInterface[] = [
     name: 'Popover Demo',
     componentType: Examples.PopoverDemo
   },
-  {
-    id: 'progress-stepper-demo',
-    name: 'Progress Stepper Demo',
-    componentType: Examples.ProgressStepperDemo
-  },
   {
     id: 'radio-demo',
     name: 'Radio Demo',
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ProgressStepperDemo/ProgressStepperDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ProgressStepperDemo/ProgressStepperDemo.tsx
deleted file mode 100644
index d3a468cca2e..00000000000
--- a/packages/react-integration/demo-app-ts/src/components/demos/ProgressStepperDemo/ProgressStepperDemo.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { ProgressStepper, ProgressStep, Popover } from '@patternfly/react-core';
-import React, { Component } from 'react';
-
-export class ProgressStepperDemo extends Component {
-  componentDidMount() {
-    window.scrollTo(0, 0);
-  }
-
-  render() {
-    return (
-      <ProgressStepper>
-        <ProgressStep
-          variant="success"
-          id="popover-step1"
-          titleId="popover-step1-title"
-          aria-label="completed step with popover, step with success"
-          popoverRender={(stepRef: React.RefObject<any>) => (
-            <Popover
-              aria-label="First step help"
-              headerContent={<div>First step popover</div>}
-              bodyContent={<div>Additional info or help text content.</div>}
-              reference={stepRef}
-              position="right"
-            />
-          )}
-        >
-          First step
-        </ProgressStep>
-        <ProgressStep
-          variant="danger"
-          id="popover-step2"
-          titleId="popover-step2-title"
-          aria-label="completed step with popover, step with danger"
-          popoverRender={(stepRef: React.RefObject<any>) => (
-            <Popover
-              aria-label="Second step help"
-              headerContent={<div>Second step popover</div>}
-              bodyContent={<div>Additional info or help text content.</div>}
-              reference={stepRef}
-              position="right"
-            />
-          )}
-        >
-          Second step
-        </ProgressStep>
-        <ProgressStep
-          variant="info"
-          id="popover-step3"
-          titleId="popover-step3-title"
-          aria-label="current step with popover"
-          popoverRender={(stepRef: React.RefObject<any>) => (
-            <Popover
-              aria-label="Third step help"
-              headerContent={<div>Third step popover</div>}
-              bodyContent={<div>Additional info or help text content.</div>}
-              reference={stepRef}
-              position="right"
-            />
-          )}
-          isCurrent
-        >
-          Third step
-        </ProgressStep>
-        <ProgressStep variant="pending" id="popover-step4" titleId="popover-step4-title" aria-label="pending step">
-          Fourth step
-        </ProgressStep>
-      </ProgressStepper>
-    );
-  }
-}
-
-export default ProgressStepperDemo;
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/index.ts b/packages/react-integration/demo-app-ts/src/components/demos/index.ts
index 3fbf2ba8693..67e4532fc93 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/index.ts
+++ b/packages/react-integration/demo-app-ts/src/components/demos/index.ts
@@ -56,7 +56,6 @@ export * from './PageDemo/PageManagedSidebarClosedDemo';
 export * from './PaginationDemo/PaginationButtonVariantDemo';
 export * from './PaginationDemo/PaginationDemo';
 export * from './PopoverDemo/PopoverDemo';
-export * from './ProgressStepperDemo/ProgressStepperDemo';
 export * from './RadioDemo/RadioDemo';
 export * from './SearchInputDemo/SearchInputDemo';
 export * from './SelectDemo/FilteringSelectDemo';
