diff --git a/webpack/components/ConfirmModal.js b/webpack/components/ConfirmModal.js
index e02bacc0..81f98f11 100644
--- a/webpack/components/ConfirmModal.js
+++ b/webpack/components/ConfirmModal.js
@@ -11,6 +11,7 @@ const ConfirmModal = props => {
 
   const actions = [
     <Button
+      ouiaId={`oscap-conf-modal-${props.record.id}-confirm`}
       key="confirm"
       variant="primary"
       onClick={() => props.onConfirm(callMutation, props.record.id)}
@@ -19,6 +20,7 @@ const ConfirmModal = props => {
       {__('Confirm')}
     </Button>,
     <Button
+      ouiaId={`oscap-conf-modal-${props.record.id}-cancel`}
       key="cancel"
       variant="link"
       onClick={event => props.onClose()}
@@ -34,6 +36,7 @@ const ConfirmModal = props => {
 
   return (
     <Modal
+      ouiaId={`oscap-conf-modal-${props.record.id}`}
       variant={ModalVariant.medium}
       title={props.title}
       isOpen={props.isOpen}
diff --git a/webpack/components/EditableInput.js b/webpack/components/EditableInput.js
index 560f1f2e..4c1ddcaf 100644
--- a/webpack/components/EditableInput.js
+++ b/webpack/components/EditableInput.js
@@ -62,6 +62,7 @@ const EditableInput = props => {
   const editBtn = (
     <SplitItem>
       <Button
+        ouiaId={`oscap-edit-${props.attrName}-edit-button`}
         className="inline-edit-icon"
         aria-label={`edit ${props.attrName}`}
         variant="plain"
@@ -115,6 +116,7 @@ const EditableInput = props => {
       </SplitItem>
       <SplitItem>
         <Button
+          ouiaId={`oscap-edit-${props.attrName}-submit-button`}
           aria-label={`submit ${props.attrName}`}
           variant="plain"
           onClick={onSubmit}
@@ -125,6 +127,7 @@ const EditableInput = props => {
       </SplitItem>
       <SplitItem>
         <Button
+          ouiaId={`oscap-edit-${props.attrName}-cancel-button`}
           aria-label={`cancel editing ${props.attrName}`}
           variant="plain"
           onClick={onCancel}
diff --git a/webpack/components/EmptyState.js b/webpack/components/EmptyState.js
index fc7fda8b..be7cfed1 100644
--- a/webpack/components/EmptyState.js
+++ b/webpack/components/EmptyState.js
@@ -29,11 +29,19 @@ const EmptyStateIcon = ({ error, search, lock }) => {
   return <PfEmptyStateIcon icon={CubeIcon} />;
 };
 
-const EmptyState = ({ title, body, error, search, lock, primaryButton }) => (
+const EmptyState = ({
+  title,
+  body,
+  error,
+  search,
+  lock,
+  primaryButton,
+  ouiaEmptyStateTitleId,
+}) => (
   <Bullseye>
     <PfEmptyState variant={EmptyStateVariant.small}>
       <EmptyStateIcon error={!!error} search={search} lock={lock} />
-      <Title headingLevel="h2" size="lg">
+      <Title ouiaId={ouiaEmptyStateTitleId} headingLevel="h2" size="lg">
         {title}
       </Title>
       <EmptyStateBody>{body}</EmptyStateBody>
@@ -65,6 +73,7 @@ EmptyState.propTypes = {
   search: PropTypes.bool,
   lock: PropTypes.bool,
   primaryButton: PropTypes.node,
+  ouiaEmptyStateTitleId: PropTypes.string,
 };
 
 EmptyState.defaultProps = {
@@ -75,6 +84,7 @@ EmptyState.defaultProps = {
   search: false,
   lock: false,
   primaryButton: null,
+  ouiaEmptyStateTitleId: 'oscap-empty-state-title',
 };
 
 export default EmptyState;
diff --git a/webpack/components/IndexLayout.js b/webpack/components/IndexLayout.js
index 3a998d86..e2057601 100644
--- a/webpack/components/IndexLayout.js
+++ b/webpack/components/IndexLayout.js
@@ -21,7 +21,9 @@ const IndexLayout = ({ pageTitle, children, contentWidthSpan }) => (
     <Grid className="scap-page-grid">
       <GridItem span={12} className="pf-u-pb-xl">
         <TextContent>
-          <Text component={TextVariants.h1}>{pageTitle}</Text>
+          <Text ouiaId="oscap-index-title" component={TextVariants.h1}>
+            {pageTitle}
+          </Text>
         </TextContent>
       </GridItem>
       <GridItem span={contentWidthSpan}>{children}</GridItem>
diff --git a/webpack/components/IndexTable/index.js b/webpack/components/IndexTable/index.js
index 4e679074..f96d8fa6 100644
--- a/webpack/components/IndexTable/index.js
+++ b/webpack/components/IndexTable/index.js
@@ -11,6 +11,7 @@ const IndexTable = ({
   totalCount,
   toolbarBtns,
   ariaTableLabel,
+  ouiaTableId,
   columns,
   ...rest
 }) => {
@@ -38,6 +39,7 @@ const IndexTable = ({
         </FlexItem>
       </Flex>
       <Table
+        ouiaId={ouiaTableId}
         aria-label={ariaTableLabel}
         cells={columns}
         {...rest}
@@ -56,6 +58,7 @@ IndexTable.propTypes = {
   toolbarBtns: PropTypes.node,
   totalCount: PropTypes.number.isRequired,
   ariaTableLabel: PropTypes.string.isRequired,
+  ouiaTableId: PropTypes.string.isRequired,
   columns: PropTypes.array.isRequired,
 };
 
diff --git a/webpack/components/LinkButton.js b/webpack/components/LinkButton.js
index f6692f63..8978e52f 100644
--- a/webpack/components/LinkButton.js
+++ b/webpack/components/LinkButton.js
@@ -9,9 +9,11 @@ const LinkButton = ({
   btnText,
   isDisabled,
   btnAriaLabel,
+  ouiaId,
 }) => (
   <Link to={path}>
     <Button
+      ouiaId={ouiaId}
       variant={btnVariant}
       isDisabled={isDisabled}
       aria-label={btnAriaLabel}
@@ -27,12 +29,14 @@ LinkButton.propTypes = {
   btnVariant: PropTypes.string,
   isDisabled: PropTypes.bool,
   btnAriaLabel: PropTypes.string,
+  ouiaId: PropTypes.string,
 };
 
 LinkButton.defaultProps = {
   btnVariant: 'primary',
   isDisabled: false,
   btnAriaLabel: null,
+  ouiaId: 'oscap-link-button',
 };
 
 export default LinkButton;
diff --git a/webpack/components/OpenscapRemediationWizard/steps/Finish.js b/webpack/components/OpenscapRemediationWizard/steps/Finish.js
index 0533866f..30451c6a 100644
--- a/webpack/components/OpenscapRemediationWizard/steps/Finish.js
+++ b/webpack/components/OpenscapRemediationWizard/steps/Finish.js
@@ -98,6 +98,7 @@ const Finish = ({ onClose }) => {
       />
     ) : (
       <EmptyState
+        ouiaEmptyStateTitleId="oscap-rem-wiz-empty-state-title"
         error
         title={__('Error!')}
         body={errorMsg(data)}
@@ -107,6 +108,7 @@ const Finish = ({ onClose }) => {
   const body =
     status === STATUS.RESOLVED ? (
       <EmptyState
+        ouiaEmptyStateTitleId="oscap-rem-wiz-empty-state-title"
         title={__(
           'The job has started on selected host(s), you can check the status on the job details page.'
         )}
diff --git a/webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js b/webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js
index 0e040a9b..e70af826 100644
--- a/webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js
+++ b/webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js
@@ -141,7 +141,12 @@ const SnippetSelect = () => {
         )}
       </Form>
     ) : (
-      <EmptyState error title={__('Error!')} body={errorMsg(logError)} />
+      <EmptyState
+        ouiaEmptyStateTitleId="oscap-rem-wiz-empty-state-title"
+        error
+        title={__('Error!')}
+        body={errorMsg(logError)}
+      />
     );
 
   return (
diff --git a/webpack/helpers/formFieldsHelper.js b/webpack/helpers/formFieldsHelper.js
index 42daa667..fd830f38 100644
--- a/webpack/helpers/formFieldsHelper.js
+++ b/webpack/helpers/formFieldsHelper.js
@@ -25,6 +25,7 @@ export const SelectField = props => {
       validated={valid}
     >
       <FormSelect
+        ouiaId={`oscap-form-sel-${field.name}`}
         {...fieldProps}
         className="without_select2"
         aria-label={fieldProps.name}