diff --git a/packages/react-core/src/components/Divider/__tests__/Divider.test.tsx b/packages/react-core/src/components/Divider/__tests__/Divider.test.tsx
index 6b940d6841c..53c07ba172b 100644
--- a/packages/react-core/src/components/Divider/__tests__/Divider.test.tsx
+++ b/packages/react-core/src/components/Divider/__tests__/Divider.test.tsx
@@ -1,34 +1,98 @@
-import { Divider } from '../Divider';
-import { Flex, FlexItem } from '../../../layouts/Flex';
 import * as React from 'react';
-import { render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import { Divider } from '../Divider';
 
-test('divider using hr', () => {
-  const { asFragment } = render(<Divider />);
-  expect(asFragment()).toMatchSnapshot();
+test('Renders with only the class pf-v5-c-divider by default', () => {
+  render(<Divider data-testid="divider" />);
+  expect(screen.getByTestId('divider')).toHaveClass('pf-v5-c-divider', { exact: true });
 });
 
-test('divider using li', () => {
-  const { asFragment } = render(<Divider component="li" />);
-  expect(asFragment()).toMatchSnapshot();
+test('Renders with horizontal rule by default', () => {
+  render(<Divider />);
+  expect(screen.getByRole('separator')).toContainHTML('<hr class="pf-v5-c-divider" />');
 });
 
-test('divider using div', () => {
-  const { asFragment } = render(<Divider component="div" />);
-  expect(asFragment()).toMatchSnapshot();
+test('Renders with vertical divider', () => {
+  render(<Divider orientation={{ default: 'vertical' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-vertical');
+});
+
+test('Renders with li', () => {
+  render(<Divider component="li" />);
+  expect(screen.getByRole('separator')).toContainHTML('<li class="pf-v5-c-divider" role="separator" />');
+});
+
+test('Renders with div', () => {
+  render(<Divider component="div" />);
+  expect(screen.getByRole('separator')).toContainHTML('<div class="pf-v5-c-divider" role="separator" />');
 });
 
-test('vertical divider', () => {
-  const { asFragment } = render(
-    <Flex>
-      <FlexItem>first item</FlexItem>
-      <Divider
-        orientation={{
-          default: 'vertical'
-        }}
-      />
-      <FlexItem>second item</FlexItem>
-    </Flex>
-  );
+test('Test default orientation', () => {
+  render(<Divider orientation={{ default: 'vertical' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-vertical');
+});
+
+test('Test sm orientation', () => {
+  render(<Divider orientation={{ sm: 'horizontal' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-horizontal-on-sm');
+});
+
+test('Test md orientation', () => {
+  render(<Divider orientation={{ md: 'vertical' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-vertical-on-md');
+});
+
+test('Test lg orientation', () => {
+  render(<Divider orientation={{ lg: 'horizontal' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-horizontal-on-lg');
+});
+
+test('Test xl orientation', () => {
+  render(<Divider orientation={{ xl: 'vertical' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-vertical-on-xl');
+});
+
+test('Test 2xl orientation', () => {
+  render(<Divider orientation={{ '2xl': 'horizontal' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-horizontal-on-2xl');
+});
+
+test('Test default inset', () => {
+  render(<Divider inset={{ default: 'insetNone' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-inset-none');
+});
+
+test('Test sm inset', () => {
+  render(<Divider inset={{ sm: 'insetSm' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-inset-sm-on-sm');
+});
+
+test('Test md inset', () => {
+  render(<Divider inset={{ md: 'insetMd' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-inset-md-on-md');
+});
+
+test('Test lg inset', () => {
+  render(<Divider inset={{ lg: 'insetLg' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-inset-lg-on-lg');
+});
+
+test('Test xl inset', () => {
+  render(<Divider inset={{ xl: 'insetXl' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-inset-xl-on-xl');
+});
+
+test('Test 2xl inset', () => {
+  render(<Divider inset={{ '2xl': 'inset2xl' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-inset-2xl-on-2xl');
+});
+
+test('Test 3xl on 2xl inset', () => {
+  render(<Divider inset={{ '2xl': 'inset3xl' }} />);
+  expect(screen.getByRole('separator')).toHaveClass('pf-m-inset-3xl-on-2xl');
+});
+
+test('Matches the snapshot', () => {
+  const { asFragment } = render(<Divider />);
   expect(asFragment()).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap b/packages/react-core/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap
index 03b490d6b5b..1821213154b 100644
--- a/packages/react-core/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap
+++ b/packages/react-core/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap
@@ -1,49 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`divider using div 1`] = `
-<DocumentFragment>
-  <div
-    class="pf-v5-c-divider"
-    role="separator"
-  />
-</DocumentFragment>
-`;
-
-exports[`divider using hr 1`] = `
+exports[`Matches the snapshot 1`] = `
 <DocumentFragment>
   <hr
     class="pf-v5-c-divider"
   />
 </DocumentFragment>
 `;
-
-exports[`divider using li 1`] = `
-<DocumentFragment>
-  <li
-    class="pf-v5-c-divider"
-    role="separator"
-  />
-</DocumentFragment>
-`;
-
-exports[`vertical divider 1`] = `
-<DocumentFragment>
-  <div
-    class="pf-v5-l-flex"
-  >
-    <div
-      class=""
-    >
-      first item
-    </div>
-    <hr
-      class="pf-v5-c-divider pf-m-vertical"
-    />
-    <div
-      class=""
-    >
-      second item
-    </div>
-  </div>
-</DocumentFragment>
-`;