diff --git a/tests/functional/data-store/00-prune-optional-break.t b/tests/functional/data-store/00-prune-optional-break.t
index 9b09ac8d156..b50e5a51664 100755
--- a/tests/functional/data-store/00-prune-optional-break.t
+++ b/tests/functional/data-store/00-prune-optional-break.t
@@ -27,9 +27,9 @@ init_workflow "${TEST_NAME_BASE}" << __FLOW__
     final cycle point = 1
     [[graph]]
         P1 = """
-a? => b? => c?
-d => e
-"""
+            a => b? => c?
+            a => d => e
+        """
 [runtime]
     [[a,c,e]]
         script = true
@@ -37,15 +37,15 @@ d => e
         script = false
     [[d]]
         script = """
-cylc workflow-state \${CYLC_WORKFLOW_ID}//1/b:failed --interval=2
-cylc pause \$CYLC_WORKFLOW_ID
-"""
+            cylc workflow-state \${CYLC_WORKFLOW_ID}//1/b:failed --interval=2 --max-polls=20 -v
+            cylc pause \$CYLC_WORKFLOW_ID
+        """
 __FLOW__
 
 # run workflow
 run_ok "${TEST_NAME_BASE}-run" cylc play "${WORKFLOW_NAME}"
 
-cylc workflow-state "${WORKFLOW_NAME}/1/d:succeeded" --interval=2 --max-polls=60
+cylc workflow-state "${WORKFLOW_NAME}//1/d:succeeded" --interval=2 --max-polls=60 -v
 
 # query workflow
 TEST_NAME="${TEST_NAME_BASE}-prune-optional-break"
diff --git a/tests/functional/flow-triggers/10-specific-flow.t b/tests/functional/flow-triggers/10-specific-flow.t
index ce5e80a6c68..238f1e12670 100644
--- a/tests/functional/flow-triggers/10-specific-flow.t
+++ b/tests/functional/flow-triggers/10-specific-flow.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC WORKFLOW ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
+# Test targeting a specific flow, with trigger --wait.
 
 . "$(dirname "$0")/test_header"
 set_test_number 2
diff --git a/tests/functional/flow-triggers/10-specific-flow/flow.cylc b/tests/functional/flow-triggers/10-specific-flow/flow.cylc
index 46ba6dab4c1..ff6196a6871 100644
--- a/tests/functional/flow-triggers/10-specific-flow/flow.cylc
+++ b/tests/functional/flow-triggers/10-specific-flow/flow.cylc
@@ -17,6 +17,10 @@
    [[trigger-happy]]
       script = """
          cylc trigger --flow=2 --wait ${CYLC_WORKFLOW_ID}//1/f
-         cylc__job__poll_grep_workflow_log "1/d/01:submitted.*running"
-         cylc trigger --flow=2 ${CYLC_WORKFLOW_ID}//1/b
+      """
+   [[d]]
+      script = """
+         if [[ "$CYLC_TASK_SUBMIT_NUMBER" == "1" ]]; then
+            cylc trigger --flow=2 ${CYLC_WORKFLOW_ID}//1/b
+         fi
       """
diff --git a/tests/functional/reload/26-stalled.t b/tests/functional/reload/26-stalled.t
index 63dabb2ba81..8f6e7594a48 100644
--- a/tests/functional/reload/26-stalled.t
+++ b/tests/functional/reload/26-stalled.t
@@ -26,7 +26,7 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW__'
 [scheduler]
     [[events]]
         stall handlers = cylc reload %(workflow)s
-        stall timeout = PT10S
+        stall timeout = PT30S
         abort on stall timeout = True
         # Prevent infinite loop if the bug resurfaces
         workflow timeout = PT3M
diff --git a/tests/functional/triggering/08-fam-finish-any.t b/tests/functional/triggering/08-fam-finish-any.t
index 2dda6132723..6849ee4a1c2 100644
--- a/tests/functional/triggering/08-fam-finish-any.t
+++ b/tests/functional/triggering/08-fam-finish-any.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC WORKFLOW ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -17,6 +17,7 @@
 #-------------------------------------------------------------------------------
 # Test correct expansion of 'FAM:finish-any'
 . "$(dirname "$0")/test_header"
+skip_macos_gh_actions
 set_test_number 2
 reftest
 exit