diff --git a/awx/ui_next/.eslintrc b/awx/ui_next/.eslintrc
index 90c96ae87b..94500c2691 100644
--- a/awx/ui_next/.eslintrc
+++ b/awx/ui_next/.eslintrc
@@ -81,7 +81,8 @@
           "gridColumns",
           "rows",
           "href",
-          "modifier"
+          "modifier",
+          "data-cy"
         ],
         "ignore": ["Ansible", "Tower", "JSON", "YAML", "lg"],
         "ignoreComponent": [
diff --git a/awx/ui_next/src/components/Schedule/ScheduleEdit/ScheduleEdit.test.jsx b/awx/ui_next/src/components/Schedule/ScheduleEdit/ScheduleEdit.test.jsx
index 2f1f2fe85b..02a73db2be 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleEdit/ScheduleEdit.test.jsx
+++ b/awx/ui_next/src/components/Schedule/ScheduleEdit/ScheduleEdit.test.jsx
@@ -136,7 +136,7 @@ describe('<ScheduleEdit />', () => {
           resource={{
             id: 700,
             type: 'job_template',
-            iventory: 1,
+            inventory: 1,
             summary_fields: {
               credentials: [
                 { name: 'job template credential', id: 75, kind: 'ssh' },
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
index 25ae4ac23a..3e76a34234 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
@@ -157,7 +157,7 @@ function CredentialFormFields({ i18n, initialTypeId, credentialTypes }) {
         <SelectOption
           key={credType.value}
           value={credType.value}
-          dataCy={`${credType.id}-credential-type-select-option`}
+          data-cy={`${credType.id}-credential-type-select-option`}
         >
           {credType.label}
         </SelectOption>
diff --git a/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.test.jsx
index fd36b84877..c40021e35d 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.test.jsx
@@ -90,14 +90,13 @@ describe('<InventoryDetail />', () => {
     expectDetailToMatch(wrapper, 'Name', mockInventory.name);
     expectDetailToMatch(wrapper, 'Description', mockInventory.description);
     expectDetailToMatch(wrapper, 'Type', 'Inventory');
+    const link = wrapper.find('Detail[label="Organization"]').find('Link');
+
     const org = wrapper.find('Detail[label="Organization"]');
-    expect(org.prop('value')).toMatchInlineSnapshot(`
-      <Link
-        to="/organizations/1/details"
-      >
-        The Organization
-      </Link>
-    `);
+
+    expect(link.prop('to')).toEqual('/organizations/1/details');
+    expect(org.length).toBe(1);
+
     const vars = wrapper.find('VariablesDetail');
     expect(vars).toHaveLength(1);
     expect(vars.prop('value')).toEqual(mockInventory.variables);
diff --git a/awx/ui_next/src/screens/Login/Login.jsx b/awx/ui_next/src/screens/Login/Login.jsx
index d23c0f4f82..7448eccfd0 100644
--- a/awx/ui_next/src/screens/Login/Login.jsx
+++ b/awx/ui_next/src/screens/Login/Login.jsx
@@ -131,12 +131,12 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
   }
 
   const HeaderBrand = (
-    <Brand dataCy="brand-logo" src={logo} alt={alt || brandName} />
+    <Brand data-cy="brand-logo" src={logo} alt={alt || brandName} />
   );
   const Header = <LoginHeader headerBrand={HeaderBrand} />;
   const Footer = (
     <LoginFooter
-      dataCy="login-footer"
+      data-cy="login-footer"
       dangerouslySetInnerHTML={{
         __html: sanitizeHtml(loginInfo),
       }}
@@ -146,7 +146,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
   return (
     <Login header={Header} footer={Footer}>
       <LoginMainHeader
-        dataCy="login-header"
+        data-cy="login-header"
         title={
           brandName
             ? i18n._(t`Welcome to Ansible ${brandName}! Please Sign In.`)
@@ -163,7 +163,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
         >
           {formik => (
             <LoginForm
-              dataCy="login-form"
+              data-cy="login-form"
               className={authError ? 'pf-m-error' : ''}
               helperText={helperText}
               isLoginButtonDisabled={isAuthenticating}
@@ -193,7 +193,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
             variant="error"
             title={i18n._(t`Error!`)}
             onClose={dismissLoginInfoError}
-            dataCy="login-info-error"
+            data-cy="login-info-error"
           >
             {i18n._(
               t`Failed to fetch custom login configuration settings.  System defaults will be shown instead.`
@@ -211,7 +211,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                 if (authKey === 'azuread-oauth2') {
                   return (
                     <LoginMainFooterLinksItem
-                      dataCy="social-auth-azure"
+                      data-cy="social-auth-azure"
                       href={loginUrl}
                       key={authKey}
                     >
@@ -224,7 +224,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                 if (authKey === 'github') {
                   return (
                     <LoginMainFooterLinksItem
-                      dataCy="social-auth-github"
+                      data-cy="social-auth-github"
                       href={loginUrl}
                       key={authKey}
                     >
@@ -237,7 +237,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                 if (authKey === 'github-org') {
                   return (
                     <LoginMainFooterLinksItem
-                      dataCy="social-auth-github-org"
+                      data-cy="social-auth-github-org"
                       href={loginUrl}
                       key={authKey}
                     >
@@ -252,7 +252,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                 if (authKey === 'github-team') {
                   return (
                     <LoginMainFooterLinksItem
-                      dataCy="social-auth-github-team"
+                      data-cy="social-auth-github-team"
                       href={loginUrl}
                       key={authKey}
                     >
@@ -265,7 +265,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                 if (authKey === 'github-enterprise') {
                   return (
                     <LoginMainFooterLinksItem
-                      dataCy="social-auth-github-enterprise"
+                      data-cy="social-auth-github-enterprise"
                       href={loginUrl}
                       key={authKey}
                     >
@@ -280,7 +280,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                 if (authKey === 'github-enterprise-org') {
                   return (
                     <LoginMainFooterLinksItem
-                      dataCy="social-auth-github-enterprise-org"
+                      data-cy="social-auth-github-enterprise-org"
                       href={loginUrl}
                       key={authKey}
                     >
@@ -297,7 +297,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                 if (authKey === 'github-enterprise-team') {
                   return (
                     <LoginMainFooterLinksItem
-                      dataCy="social-auth-github-enterprise-team"
+                      data-cy="social-auth-github-enterprise-team"
                       href={loginUrl}
                       key={authKey}
                     >
@@ -314,7 +314,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                 if (authKey === 'google-oauth2') {
                   return (
                     <LoginMainFooterLinksItem
-                      dataCy="social-auth-google"
+                      data-cy="social-auth-google"
                       href={loginUrl}
                       key={authKey}
                     >
@@ -328,7 +328,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                   const samlIDP = authKey.split(':')[1] || null;
                   return (
                     <LoginMainFooterLinksItem
-                      dataCy="social-auth-saml"
+                      data-cy="social-auth-saml"
                       href={loginUrl}
                       key={authKey}
                     >
diff --git a/awx/ui_next/src/screens/Metrics/Metrics.test.jsx b/awx/ui_next/src/screens/Metrics/Metrics.test.jsx
index 709196d703..b317e2e568 100644
--- a/awx/ui_next/src/screens/Metrics/Metrics.test.jsx
+++ b/awx/ui_next/src/screens/Metrics/Metrics.test.jsx
@@ -53,7 +53,7 @@ describe('<Metrics/>', () => {
         .prop('onClick')({}, 'instance 1');
     });
     wrapper.update();
-    await act(() => {
+    await act(async () => {
       wrapper.find('Select[ouiaId="Metric-select"]').prop('onToggle')(true);
     });
     wrapper.update();