diff --git a/apps/calendar-macos/CompassUI/Sources/CompassUI/Onboarding/WelcomeModalView.swift b/apps/calendar-macos/CompassUI/Sources/CompassUI/Onboarding/WelcomeModalView.swift
index c8321b888..dff2f371e 100644
--- a/apps/calendar-macos/CompassUI/Sources/CompassUI/Onboarding/WelcomeModalView.swift
+++ b/apps/calendar-macos/CompassUI/Sources/CompassUI/Onboarding/WelcomeModalView.swift
@@ -179,6 +179,8 @@ struct WelcomeModalView: View {
             .shadow(color: .black.opacity(0.15), radius: 6, y: 3)
         }
         .buttonStyle(.plain)
+        // The keycap is a visual hint; the title alone names the button.
+        .accessibilityLabel(title)
     }
 
     private func secondaryButton(title: String, hint: String, action: @escaping () -> Void) -> some View {
@@ -195,6 +197,8 @@ struct WelcomeModalView: View {
             .overlay(Capsule().stroke(theme.borderColor, lineWidth: 1))
         }
         .buttonStyle(.plain)
+        // The keycap is a visual hint; the title alone names the button.
+        .accessibilityLabel(title)
     }
 
     private func quietTextButton(title: String, hint: String, action: @escaping () -> Void) -> some View {
@@ -208,6 +212,8 @@ struct WelcomeModalView: View {
             .frame(maxWidth: .infinity, minHeight: 32)
         }
         .buttonStyle(.plain)
+        // The keycap is a visual hint; the title alone names the button.
+        .accessibilityLabel(title)
     }
 
     private func pillButton(title: String, hint: String, action: @escaping () -> Void) -> some View {
@@ -225,5 +231,7 @@ struct WelcomeModalView: View {
             .overlay(Capsule().stroke(theme.borderColor, lineWidth: 1))
         }
         .buttonStyle(.plain)
+        // The keycap is a visual hint; the title alone names the button.
+        .accessibilityLabel(title)
     }
 }
diff --git a/apps/calendar-macos/CompassUITests/NativeParityCaptureTests.swift b/apps/calendar-macos/CompassUITests/NativeParityCaptureTests.swift
index f7b966880..0a04d4129 100644
--- a/apps/calendar-macos/CompassUITests/NativeParityCaptureTests.swift
+++ b/apps/calendar-macos/CompassUITests/NativeParityCaptureTests.swift
@@ -260,14 +260,17 @@ final class NativeParityCaptureTests: XCTestCase {
         app.launch()
         let window = app.windows["Compass"]
         XCTAssertTrue(window.waitForExistence(timeout: 15))
-        XCTAssertTrue(
-            window.descendants(matching: .any)["compass-native-welcome-modal"].waitForExistence(timeout: 15))
+        let welcome = window.descendants(matching: .any)["compass-native-welcome-modal"]
+        XCTAssertTrue(welcome.waitForExistence(timeout: 15))
         sleep(1)
         NativeImageSnapshotSupport.captureWindow(window, named: "onboarding-welcome")
-        window.buttons["Get started for free"].click()
-        window.buttons["Next"].click()
-        XCTAssertTrue(
-            window.buttons["Start free trial with Google"].waitForExistence(timeout: 8))
+        // Scope to the panel: the grid's own "Next" (week) button is still in
+        // the window's accessibility tree behind the modal.
+        welcome.buttons["Get started for free"].click()
+        welcome.buttons["Next"].click()
+        // The provider buttons depend on the backend config; the local-only
+        // choice is always on the account step.
+        XCTAssertTrue(welcome.buttons["On this device only"].waitForExistence(timeout: 8))
         sleep(1)
         NativeImageSnapshotSupport.captureWindow(window, named: "onboarding-welcome-account-choice")
     }