diff --git a/.github/workflows/jvm_tests.yml b/.github/workflows/jvm_tests.yml
index 203a754a8..5b4e3c67f 100644
--- a/.github/workflows/jvm_tests.yml
+++ b/.github/workflows/jvm_tests.yml
@@ -12,6 +12,7 @@ concurrency:
 jobs:
   test-with-jvm:
     name: Test JVM on OS ${{ matrix.os }}
+    timeout-minutes: 30
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
diff --git a/tests/buildkite/pipeline.yml b/tests/buildkite/pipeline.yml
index ee9637b8b..19e9c6e2b 100644
--- a/tests/buildkite/pipeline.yml
+++ b/tests/buildkite/pipeline.yml
@@ -52,6 +52,7 @@ steps:
     agents:
       queue: linux-amd64-cpu
   - label: ":console: Build JVM packages"
+    timeout_in_minutes: 30
     command: "tests/buildkite/build-jvm-packages.sh"
     key: build-jvm-packages
     agents: