diff --git a/src/identity-providers/ManageOrderDialog.tsx b/src/identity-providers/ManageOrderDialog.tsx
index 0c990986df..79c735afa1 100644
--- a/src/identity-providers/ManageOrderDialog.tsx
+++ b/src/identity-providers/ManageOrderDialog.tsx
@@ -114,7 +114,7 @@ export const ManageOrderDialog = ({
         {sortBy(providers, "config.guiOrder").map((provider) => (
           <DataListItem
             aria-labelledby={provider.alias}
-            id={provider.alias}
+            id={`${provider.alias}-item`}
             key={provider.alias}
           >
             <DataListItemRow>
diff --git a/src/identity-providers/add/DescriptorSettings.tsx b/src/identity-providers/add/DescriptorSettings.tsx
index 07212cba0e..a25d1cb068 100644
--- a/src/identity-providers/add/DescriptorSettings.tsx
+++ b/src/identity-providers/add/DescriptorSettings.tsx
@@ -58,7 +58,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
     <div className="pf-c-form pf-m-horizontal">
       <FormGroup
         label={t("serviceProviderEntityId")}
-        fieldId="kc-service-provider-entity-id"
+        fieldId="kc-saml-service-provider-entity-id"
         labelIcon={
           <HelpItem
             helpText="identity-providers-help:serviceProviderEntityId"
@@ -70,7 +70,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
           type="text"
           name="config.entityId"
           data-testid="serviceProviderEntityId"
-          id="kc-service-provider-entity-id"
+          id="kc-saml-service-provider-entity-id"
           ref={register()}
         />
       </FormGroup>
diff --git a/src/identity-providers/component/DisplayOrder.tsx b/src/identity-providers/component/DisplayOrder.tsx
index 900b752d3c..228800fb36 100644
--- a/src/identity-providers/component/DisplayOrder.tsx
+++ b/src/identity-providers/component/DisplayOrder.tsx
@@ -27,7 +27,7 @@ export const DisplayOrder = () => {
         defaultValue=""
         render={({ onChange, value }) => (
           <TextInput
-            id="displayOrder"
+            id="kc-display-order"
             type="number"
             value={value}
             data-testid="displayOrder"