diff --git a/build/test-requirements.txt b/build/test-requirements.txt
index c6975ec45acf..8987c394b0ae 100644
--- a/build/test-requirements.txt
+++ b/build/test-requirements.txt
@@ -7,6 +7,7 @@ mpmath==1.3.0  # TODO(dsuo): Remove pin sinc(inf) is resolved as either nan or 0
 pillow>=11.3
 portpicker
 pytest<9.0  # Works around https://github.com/pytest-dev/pytest/issues/13895
+pytest-timeout
 pytest-xdist
 rich
 matplotlib
diff --git a/ci/run_pytest_rocm.sh b/ci/run_pytest_rocm.sh
old mode 100755
new mode 100644
index e1abdb52e801..db76396125c7
--- a/ci/run_pytest_rocm.sh
+++ b/ci/run_pytest_rocm.sh
@@ -125,6 +125,7 @@ set +e
 
 # Run single-accelerator tests in parallel
 "$JAXCI_PYTHON" -m pytest -n $num_processes --tb=short \
+--timeout=1800 \
 --json-report --json-report-file=${LOGS_DIR}/pytest_results_single.json \
 --junitxml=test-artifacts/junit-single.xml \
 --dist=loadfile \
@@ -132,6 +133,7 @@ set +e
 --deselect=tests/multi_device_test.py::MultiDeviceTest::test_computation_follows_data \
 --deselect=tests/multiprocess_gpu_test.py::MultiProcessGpuTest::test_distributed_jax_visible_devices \
 --deselect=tests/compilation_cache_test.py::CompilationCacheTest::test_task_using_cache_metric \
+--deselect=tests/pallas/gpu_ops_test.py::FusedAttentionTest::test_fused_attention_bwd8 \
 tests
 
 first_cmd_retval=$?
@@ -141,6 +143,7 @@ if [[ $gpu_count -gt 1 ]]; then
   unset JAX_ENABLE_ROCM_XDIST
 
   "$JAXCI_PYTHON" -m pytest --tb=short \
+    --timeout=1800 \
     --json-report --json-report-file=${LOGS_DIR}/pytest_results_multi.json \
     --junitxml=test-artifacts/junit-multi.xml \
     -m "multiaccelerator" \