diff --git a/portal-ui/src/screens/Console/Common/CredentialsPrompt/CredentialsPrompt.tsx b/portal-ui/src/screens/Console/Common/CredentialsPrompt/CredentialsPrompt.tsx
index 1fc42c4d9..2e2139212 100644
--- a/portal-ui/src/screens/Console/Common/CredentialsPrompt/CredentialsPrompt.tsx
+++ b/portal-ui/src/screens/Console/Common/CredentialsPrompt/CredentialsPrompt.tsx
@@ -174,6 +174,7 @@ const CredentialsPrompt = ({
         </Grid>
         <Grid item xs={12} className={classes.buttonContainer}>
           <Button
+            id={"done-button"}
             variant="outlined"
             className={classes.buttonSpacer}
             onClick={() => {
@@ -186,6 +187,7 @@ const CredentialsPrompt = ({
 
           {!idp && (
             <Button
+              id={"download-button"}
               onClick={() => {
                 let consoleExtras = {};
 
diff --git a/portal-ui/src/screens/Console/Common/GenericWizard/GenericWizard.tsx b/portal-ui/src/screens/Console/Common/GenericWizard/GenericWizard.tsx
index e4caaf022..705e32f64 100644
--- a/portal-ui/src/screens/Console/Common/GenericWizard/GenericWizard.tsx
+++ b/portal-ui/src/screens/Console/Common/GenericWizard/GenericWizard.tsx
@@ -165,6 +165,7 @@ const GenericWizard = ({
           {wizardSteps.map((step, index) => {
             return (
               <ListItem
+                id={"wizard-step-" + step.label}
                 button
                 disableRipple
                 onClick={() => pageChange(index)}
diff --git a/portal-ui/src/screens/Console/Common/GenericWizard/WizardPage.tsx b/portal-ui/src/screens/Console/Common/GenericWizard/WizardPage.tsx
index 96aace911..955be2e3c 100644
--- a/portal-ui/src/screens/Console/Common/GenericWizard/WizardPage.tsx
+++ b/portal-ui/src/screens/Console/Common/GenericWizard/WizardPage.tsx
@@ -105,6 +105,7 @@ const WizardPage = ({
           {page.buttons.map((btn) => {
             return (
               <Button
+                id={"wizard-button-" + btn.label}
                 variant="contained"
                 color="primary"
                 size="small"
diff --git a/portal-ui/src/screens/Console/Menu/ConsoleMenuList.tsx b/portal-ui/src/screens/Console/Menu/ConsoleMenuList.tsx
index 998ce812d..2af396415 100644
--- a/portal-ui/src/screens/Console/Menu/ConsoleMenuList.tsx
+++ b/portal-ui/src/screens/Console/Menu/ConsoleMenuList.tsx
@@ -157,6 +157,7 @@ const ConsoleMenuList = ({
           </ListItemIcon>
           <ListItemText
             primary="Logout"
+            id={"logout"}
             sx={{ ...menuItemTextStyles }}
             className={stateClsName}
           />
diff --git a/portal-ui/src/screens/Console/Tenants/ListTenants/ListTenants.tsx b/portal-ui/src/screens/Console/Tenants/ListTenants/ListTenants.tsx
index 8f929e51d..dde1635a9 100644
--- a/portal-ui/src/screens/Console/Tenants/ListTenants/ListTenants.tsx
+++ b/portal-ui/src/screens/Console/Tenants/ListTenants/ListTenants.tsx
@@ -208,6 +208,7 @@ const ListTenants = ({ classes, setErrorSnackMessage }: ITenantsList) => {
             />
 
             <RBIconButton
+              id={"refresh-tenant-list"}
               tooltip={"Refresh Tenant List"}
               text={""}
               onClick={() => {
diff --git a/portal-ui/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx b/portal-ui/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx
index f3fb5e6bf..3a7e00f53 100644
--- a/portal-ui/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx
+++ b/portal-ui/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx
@@ -177,6 +177,7 @@ const TenantListItem = ({ tenant, classes }: ITenantListItem) => {
           </Grid>
           <Grid item xs={4} textAlign={"end"}>
             <RBIconButton
+              id={"manage-tenant-" + tenant.name}
               tooltip={"Manage Tenant"}
               text={"Manage"}
               disabled={!tenantIsOnline(tenant)}
@@ -190,6 +191,7 @@ const TenantListItem = ({ tenant, classes }: ITenantListItem) => {
               variant={"outlined"}
             />
             <RBIconButton
+              id={"view-tenant-" + tenant.name}
               tooltip={"View Tenant"}
               text={"View"}
               onClick={() => {