diff --git a/webapp/channels/src/components/apps_form/apps_form_field/apps_form_field.tsx b/webapp/channels/src/components/apps_form/apps_form_field/apps_form_field.tsx
index b38443fc328..4b7e64dbde7 100644
--- a/webapp/channels/src/components/apps_form/apps_form_field/apps_form_field.tsx
+++ b/webapp/channels/src/components/apps_form/apps_form_field/apps_form_field.tsx
@@ -146,6 +146,7 @@ export default class AppsFormField extends React.PureComponent<Props> {
             return (
                 <AppsFormSelectField
                     {...this.props}
+                    id={name}
                     teammateNameDisplay={this.props.teammateNameDisplay}
                     field={field}
                     label={displayNameContent}
diff --git a/webapp/channels/src/components/apps_form/apps_form_field/apps_form_select_field.tsx b/webapp/channels/src/components/apps_form/apps_form_field/apps_form_select_field.tsx
index 84fb8f02ecc..31bd690aec9 100644
--- a/webapp/channels/src/components/apps_form/apps_form_field/apps_form_select_field.tsx
+++ b/webapp/channels/src/components/apps_form/apps_form_field/apps_form_select_field.tsx
@@ -21,6 +21,7 @@ import {SelectChannelOption} from './select_channel_option';
 import {SelectUserOption} from './select_user_option';
 
 export type Props = {
+    id: string;
     field: AppField;
     label: React.ReactNode;
     helpText: React.ReactNode;
@@ -226,6 +227,7 @@ export default class AppsFormSelectField extends React.PureComponent<Props, Stat
 
         return (
             <div
+                data-testid={this.props.id}
                 className='form-group'
             >
                 {label && (