diff --git a/ui/src/admin/components/RoleEditingRow.js b/ui/src/admin/components/RoleEditingRow.js
index 3cda61f11..bd736e9ba 100644
--- a/ui/src/admin/components/RoleEditingRow.js
+++ b/ui/src/admin/components/RoleEditingRow.js
@@ -38,6 +38,7 @@ class RoleEditingRow extends Component {
           autoFocus={true}
           spellCheck={false}
           autoComplete="false"
+          data-test="role-name--input"
         />
       </td>
     )
diff --git a/ui/src/admin/components/RoleRow.js b/ui/src/admin/components/RoleRow.js
index d851e09e2..fafa4c05b 100644
--- a/ui/src/admin/components/RoleRow.js
+++ b/ui/src/admin/components/RoleRow.js
@@ -67,7 +67,7 @@ const RoleRow = ({
   }
 
   return (
-    <tr>
+    <tr data-test={`role-${roleName}--row`}>
       <td style={{width: `${ROLES_TABLE.colName}px`}}>{roleName}</td>
       <td>
         {allPermissions && allPermissions.length ? (
diff --git a/ui/src/admin/components/UserRow.tsx b/ui/src/admin/components/UserRow.tsx
index 2e7b4df39..1d35cb4a6 100644
--- a/ui/src/admin/components/UserRow.tsx
+++ b/ui/src/admin/components/UserRow.tsx
@@ -74,6 +74,7 @@ const UserRow = ({
         <td
           className="admin-table--left-offset"
           title={!allRoles.length ? 'No roles are defined' : ''}
+          data-test="roles-granted"
         >
           {user.roles.map((role, i) => (
             <span key={i} className="role-value granted">
diff --git a/ui/src/admin/containers/influxdb/UserPage.tsx b/ui/src/admin/containers/influxdb/UserPage.tsx
index f23c5c6c7..b6c236a1b 100644
--- a/ui/src/admin/containers/influxdb/UserPage.tsx
+++ b/ui/src/admin/containers/influxdb/UserPage.tsx
@@ -383,6 +383,7 @@ const UserPage = ({
                                 : ''
                             }`}
                             onClick={onRoleChange}
+                            data-test={`role-${roleName}--button`}
                           >
                             {roleName}
                           </div>