diff --git a/.github/workflows/parse_logs.py b/.github/workflows/parse_logs.py
index 4d3bea54e50..545beaa4167 100644
--- a/.github/workflows/parse_logs.py
+++ b/.github/workflows/parse_logs.py
@@ -18,7 +18,7 @@ def extract_short_test_summary_info(lines):
     )
     up_to_section_content = itertools.islice(up_to_start_of_section, 1, None)
     section_content = itertools.takewhile(
-        lambda l: l.startswith("FAILED"), up_to_section_content
+        lambda l: l.startswith("FAILED") or l.startswith("ERROR"), up_to_section_content
     )
     content = "\n".join(section_content)
 
diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml
index bba7c04a9c2..e55be4da329 100644
--- a/.github/workflows/upstream-dev-ci.yaml
+++ b/.github/workflows/upstream-dev-ci.yaml
@@ -77,7 +77,7 @@ jobs:
         id: status
         run: |
           set -euo pipefail
-          python -m pytest -rf | tee output-${{ matrix.python-version }}-log || (
+          python -m pytest --timeout=60 -rf | tee output-${{ matrix.python-version }}-log || (
               echo '::set-output name=ARTIFACTS_AVAILABLE::true' && false
           )
       - name: Upload artifacts
diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh
index fe3e706f6a6..8458a8df352 100755
--- a/ci/install-upstream-wheels.sh
+++ b/ci/install-upstream-wheels.sh
@@ -16,6 +16,8 @@ conda uninstall -y --force \
     pint \
     bottleneck \
     sparse
+# to limit the runtime of Upstream CI
+python -m pip install pytest-timeout
 python -m pip install \
     -i https://pypi.anaconda.org/scipy-wheels-nightly/simple \
     --no-deps \