diff --git a/packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx b/packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx
index e8b1b2fdecc..c190648b086 100644
--- a/packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx
+++ b/packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx
@@ -1,8 +1,9 @@
 import * as React from 'react';
 import { Button } from '../Button';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
+import { OUIAProps } from '../../helpers';
 
-export interface ModalBoxCloseButtonProps {
+export interface ModalBoxCloseButtonProps extends OUIAProps {
   /** Additional classes added to the close button */
   className?: string;
   /** A callback for when the close button is clicked */
@@ -12,9 +13,17 @@ export interface ModalBoxCloseButtonProps {
 export const ModalBoxCloseButton: React.FunctionComponent<ModalBoxCloseButtonProps> = ({
   className = '',
   onClose = () => undefined as any,
+  ouiaId,
   ...props
 }: ModalBoxCloseButtonProps) => (
-  <Button className={className} variant="plain" onClick={onClose} aria-label="Close" {...props}>
+  <Button
+    className={className}
+    variant="plain"
+    onClick={onClose}
+    aria-label="Close"
+    {...(ouiaId && { ouiaId: `${ouiaId}-${ModalBoxCloseButton.displayName}` })}
+    {...props}
+  >
     <TimesIcon />
   </Button>
 );
diff --git a/packages/react-core/src/components/Modal/ModalContent.tsx b/packages/react-core/src/components/Modal/ModalContent.tsx
index 480711c39f2..4058c3dcff0 100644
--- a/packages/react-core/src/components/Modal/ModalContent.tsx
+++ b/packages/react-core/src/components/Modal/ModalContent.tsx
@@ -162,7 +162,7 @@ export const ModalContent: React.FunctionComponent<ModalContentProps> = ({
       aria-describedby={ariaDescribedby || (hasNoBodyWrapper ? null : descriptorId)}
       {...getOUIAProps(ModalContent.displayName, ouiaId, ouiaSafe)}
     >
-      {showClose && <ModalBoxCloseButton onClose={onClose} />}
+      {showClose && <ModalBoxCloseButton onClose={onClose} ouiaId={ouiaId} />}
       {modalBoxHeader}
       {modalBody}
       {modalBoxFooter}