diff --git a/.github/workflows/java_tests.yml b/.github/workflows/java_tests.yml
index f176fe018d7c..1d6441b24681 100644
--- a/.github/workflows/java_tests.yml
+++ b/.github/workflows/java_tests.yml
@@ -162,11 +162,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [[self-hosted, ubuntu-20.04, main], windows-latest]
+    # TODO(https://github.com/apache/beam/issues/31848) run on Dataflow after fixes credential on macOS/win GHA runner
     if: |
-      needs.check_gcp_variables.outputs.gcp-variables-set == 'true' && (
-        (github.event_name == 'push' || github.event_name == 'schedule') ||
+      needs.check_gcp_variables.outputs.gcp-variables-set == 'true' &&
         (github.event_name == 'workflow_dispatch' && github.event.inputs.runDataflow == 'true')
-      )
     steps:
       - name: Check out code
         uses: actions/checkout@v4
diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml
index be1659fec437..a65b26645533 100644
--- a/.github/workflows/python_tests.yml
+++ b/.github/workflows/python_tests.yml
@@ -153,6 +153,8 @@ jobs:
 
   python_wordcount_dataflow:
     name: 'Python Wordcount Dataflow'
+    # TODO(https://github.com/apache/beam/issues/31848) run on Dataflow after fixes credential on macOS/win GHA runner
+    if: (github.event_name == 'workflow_dispatch' && github.event.inputs.runDataflow == 'true')
     needs:
       - build_python_sdk_source
     runs-on: ${{ matrix.os }}