diff --git a/apps/web/src/components/settings/SettingSummaryRow.client.test.tsx b/apps/web/src/components/settings/SettingSummaryRow.client.test.tsx
index f907a4798..6f00ba977 100644
--- a/apps/web/src/components/settings/SettingSummaryRow.client.test.tsx
+++ b/apps/web/src/components/settings/SettingSummaryRow.client.test.tsx
@@ -20,7 +20,9 @@ describe('SettingSummaryRow', () => {
     expect(screen.getByText('Schedule:')).toBeInTheDocument();
     expect(screen.getByText('Daily')).toBeInTheDocument();
     expect(document.querySelector('svg.lucide-calendar')).not.toBeNull();
-    fireEvent.click(screen.getByRole('button', { name: 'Edit' }));
+    const edit = screen.getByRole('button', { name: 'Edit Schedule' });
+    expect(edit).toHaveTextContent('Edit');
+    fireEvent.click(edit);
     expect(onEdit).toHaveBeenCalledOnce();
   });
 });
diff --git a/apps/web/src/components/settings/SettingSummaryRow.tsx b/apps/web/src/components/settings/SettingSummaryRow.tsx
index 7f7d8bab4..67c1981b0 100644
--- a/apps/web/src/components/settings/SettingSummaryRow.tsx
+++ b/apps/web/src/components/settings/SettingSummaryRow.tsx
@@ -27,6 +27,7 @@ export function SettingSummaryRow({
         </span>
         {action ?? (
           <Button
+            aria-label={actionLabel === 'Edit' ? `Edit ${label}` : actionLabel}
             type="button"
             variant="link"
             size="sm"
diff --git a/apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx b/apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx
index 95829df36..20e4518e3 100644
--- a/apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx
+++ b/apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx
@@ -1040,7 +1040,9 @@ function editSummaryRow(label: string) {
   const labelNode = screen.getByText(`${label}:`, { exact: true });
   const summary = labelNode.parentElement;
   if (!summary) throw new Error(`Missing summary row for ${label}`);
-  fireEvent.click(within(summary).getByRole('button', { name: 'Edit' }));
+  fireEvent.click(
+    within(summary).getByRole('button', { name: `Edit ${label}` }),
+  );
 }
 
 function setRunnableCustomAutomation(launchCriteria?: string) {
@@ -1205,7 +1207,9 @@ describe('AutomationsSettings', () => {
     const dialog = screen.getByRole('dialog', {
       name: 'Call Roomote via emoji',
     });
-    fireEvent.click(within(dialog).getByRole('button', { name: 'Edit' }));
+    fireEvent.click(
+      within(dialog).getByRole('button', { name: 'Edit Emoji reactions' }),
+    );
     fireEvent.click(
       within(dialog).getByRole('switch', { name: 'Emoji reactions enabled' }),
     );
diff --git a/apps/web/src/components/settings/automations/CustomAutomationsSection.tsx b/apps/web/src/components/settings/automations/CustomAutomationsSection.tsx
index 56513e08e..cb2421b5d 100644
--- a/apps/web/src/components/settings/automations/CustomAutomationsSection.tsx
+++ b/apps/web/src/components/settings/automations/CustomAutomationsSection.tsx
@@ -1467,6 +1467,7 @@ export function CustomAutomationsSection({
               onOpenChange={setModelPickerOpen}
               trigger={
                 <Button
+                  aria-label="Edit Model"
                   type="button"
                   variant="link"
                   size="sm"
diff --git a/apps/web/src/components/settings/automations/ScheduleOnlyAutomationContent.client.test.tsx b/apps/web/src/components/settings/automations/ScheduleOnlyAutomationContent.client.test.tsx
index e71b0b4b0..e7886bd69 100644
--- a/apps/web/src/components/settings/automations/ScheduleOnlyAutomationContent.client.test.tsx
+++ b/apps/web/src/components/settings/automations/ScheduleOnlyAutomationContent.client.test.tsx
@@ -57,13 +57,15 @@ describe('ScheduleOnlyAutomationContent', () => {
       />,
     );
 
-    expect(screen.getByRole('button', { name: 'Edit' })).toBeInTheDocument();
+    expect(
+      screen.getByRole('button', { name: 'Edit Schedule' }),
+    ).toBeInTheDocument();
     expect(
       screen.queryByLabelText('Code Quality Auditor schedule'),
     ).not.toBeInTheDocument();
     expect(screen.queryByText(details[0])).not.toBeInTheDocument();
 
-    fireEvent.click(screen.getByRole('button', { name: 'Edit' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Edit Schedule' }));
     expect(
       screen.getByLabelText('Code Quality Auditor schedule'),
     ).toBeInTheDocument();