diff --git a/packages/patternfly-4/react-core/src/layouts/Flex/Flex.test.tsx b/packages/patternfly-4/react-core/src/layouts/Flex/Flex.test.tsx
index 92e4b0b6700..10d8c6af2a4 100644
--- a/packages/patternfly-4/react-core/src/layouts/Flex/Flex.test.tsx
+++ b/packages/patternfly-4/react-core/src/layouts/Flex/Flex.test.tsx
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { Flex } from './Flex';
 import { FlexItem } from './FlexItem';
-import { shallow } from 'enzyme';
+import { shallow, mount } from 'enzyme';
+import { FlexModifiers, FlexItemModifiers } from './FlexUtils';
 
 test('Simple flex with single item', () => {
   const view = shallow(
@@ -33,3 +34,21 @@ test('extra props are spread to the root element', () => {
   const view = shallow(<Flex data-testid={testId} />);
   expect(view.prop('data-testid')).toBe(testId);
 });
+
+describe('flex modifiers', () => {
+  Object.values(FlexModifiers).forEach(mod => {
+    test(`${mod} is a valid modifier`, () => {
+      const view = mount(<Flex breakpointMods={[{ modifier: mod as keyof typeof FlexModifiers }]}>{mod}</Flex>)
+      expect(view.find('div').prop('className')).not.toMatch(/undefined/)
+    })
+  })
+});
+
+describe('flex item modifiers', () => {
+  Object.values(FlexItemModifiers).forEach(mod => {
+    test(`${mod} is a valid modifier`, () => {
+      const view = mount(<FlexItem breakpointMods={[{ modifier: mod as keyof typeof FlexItemModifiers }]}>{mod}</FlexItem>)
+      expect(view.find('div').prop('className')).not.toMatch(/undefined/)
+    })
+  })
+});
\ No newline at end of file
diff --git a/packages/patternfly-4/react-core/src/layouts/Flex/FlexUtils.tsx b/packages/patternfly-4/react-core/src/layouts/Flex/FlexUtils.tsx
index 288d098b22f..93089edc391 100644
--- a/packages/patternfly-4/react-core/src/layouts/Flex/FlexUtils.tsx
+++ b/packages/patternfly-4/react-core/src/layouts/Flex/FlexUtils.tsx
@@ -40,19 +40,18 @@ export enum FlexModifiers {
   'align-left' = 'align-left',
   'align-self-flex-start' = 'align-self-flex-start',
   'align-self-flex-end' = 'align-self-flex-end',
-  'align-self-flex-center' = 'align-self-flex-center',
-  'align-self-flex-baseline' = 'align-self-flex-baseline',
-  'align-self-flex-stretch' = 'align-self-flex-stretch',
+  'align-self-center' = 'align-self-center',
+  'align-self-baseline' = 'align-self-baseline',
+  'align-self-stretch' = 'align-self-stretch',
   'justify-content-flex-end' = 'justify-content-flex-end',
   'justify-content-center' = 'justify-content-center',
-  'justify-content-flex-space-between' = 'justify-content-flex-space-between',
+  'justify-content-space-between' = 'justify-content-space-between',
   'justify-content-space-around' = 'justify-content-space-around',
   'justify-content-space-evenly' = 'justify-content-space-evenly',
   'justify-content-flex-start' = 'justify-content-flex-start',
   'full-width' = 'full-width',
   'align-items-flex-start' = 'align-items-flex-start',
   'align-items-flex-end' = 'align-items-flex-end',
-  'align-items-center' = 'align-items-center',
   'align-items-stretch' = 'align-items-stretch',
   'align-items-baseline' = 'align-items-baseline',
   'align-content-flex-start' = 'align-content-flex-start',
@@ -84,9 +83,9 @@ export enum FlexItemModifiers {
   'align-left' = 'align-left',
   'align-self-flex-start' = 'align-self-flex-start',
   'align-self-flex-end' = 'align-self-flex-end',
-  'align-self-flex-center' = 'align-self-flex-center',
-  'align-self-flex-baseline' = 'align-self-flex-baseline',
-  'align-self-flex-stretch' = 'align-self-flex-stretch',
+  'align-self-center' = 'align-self-center',
+  'align-self-baseline' = 'align-self-baseline',
+  'align-self-stretch' = 'align-self-stretch',
   'full-width' = 'full-width'
 }