diff --git a/.maestro/features/09-calendar.yaml b/.maestro/features/09-calendar.yaml
index 5e3d4ffb..b7043dc7 100644
--- a/.maestro/features/09-calendar.yaml
+++ b/.maestro/features/09-calendar.yaml
@@ -34,7 +34,12 @@ tags:
     timeout: 5000
 - takeScreenshot: calendar-04-week
 
-# Create
+# Create. The button starts the event on the selected day: make that today
+# (a stray tap, such as one through the notification prompt, can select
+# another day), so the schedule below finds it after Go to today.
+- tapOn: "Go to today"
+- waitForAnimationToEnd:
+    timeout: 3000
 - tapOn: "New event"
 - extendedWaitUntil:
     visible: "Save"
diff --git a/.maestro/subflows/allow-notifications.yaml b/.maestro/subflows/allow-notifications.yaml
index 154ee098..e9b72487 100644
--- a/.maestro/subflows/allow-notifications.yaml
+++ b/.maestro/subflows/allow-notifications.yaml
@@ -11,9 +11,13 @@ appId: org.bulwarkmail.mobile
       - setOrientation: PORTRAIT
       - waitForAnimationToEnd:
           timeout: 3000
+      # Maestro repeats a tap that seems to change nothing; here the repeat
+      # landed on the app once the alert was gone (a day in the calendar's
+      # month grid, which opened that day). Tap once.
       - tapOn:
           text: "Allow"
           optional: true
+          retryTapIfNoChange: false
       - runFlow:
           when:
             true: ${ORIENTATION == 'landscape'}