diff --git a/src/UserMenu.tsx b/src/UserMenu.tsx
index 6a1b3a0..55fc05d 100644
--- a/src/UserMenu.tsx
+++ b/src/UserMenu.tsx
@@ -116,8 +116,13 @@ export function UserMenu({
       {(props) => (
         <Menu {...props} label={t("User menu")} onAction={onAction}>
           {items.map(({ key, icon: Icon, label, dataTestid }) => (
-            <Item key={key} textValue={label} data-testid={dataTestid}>
-              <Icon width={24} height={24} className={styles.menuIcon} />
+            <Item key={key} textValue={label}>
+              <Icon
+                width={24}
+                height={24}
+                className={styles.menuIcon}
+                data-testid={dataTestid}
+              />
               <Body overflowEllipsis>{label}</Body>
             </Item>
           ))}
diff --git a/src/profile/ProfileModal.tsx b/src/profile/ProfileModal.tsx
index adb1e2b..49f78ca 100644
--- a/src/profile/ProfileModal.tsx
+++ b/src/profile/ProfileModal.tsx
@@ -119,6 +119,7 @@ export function ProfileModal({ client, ...rest }: Props) {
               placeholder={t("Display name")}
               value={displayName}
               onChange={onChangeDisplayName}
+              data-testid="profile_displayname"
             />
           </FieldRow>
           {error && (
@@ -130,7 +131,11 @@ export function ProfileModal({ client, ...rest }: Props) {
             <Button type="button" variant="secondary" onPress={onClose}>
               Cancel
             </Button>
-            <Button type="submit" disabled={loading}>
+            <Button
+              type="submit"
+              disabled={loading}
+              data-testid="profile_submit"
+            >
               {loading ? t("Saving…") : t("Save")}
             </Button>
           </FieldRow>
