diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 29298cee8a..ac5e0442d8 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -150,6 +150,7 @@ jobs:
         run: python build/all.py
 
       - name: Test Player
+        timeout-minutes: 30
         shell: bash
         run: |
           browser=${{ matrix.browser }}
diff --git a/.github/workflows/selenium-lab-tests.yaml b/.github/workflows/selenium-lab-tests.yaml
index f1d1e70229..bea324e480 100644
--- a/.github/workflows/selenium-lab-tests.yaml
+++ b/.github/workflows/selenium-lab-tests.yaml
@@ -274,6 +274,7 @@ jobs:
       # ALLOCATED_PORT must be defined by the self-hosted runner, and mapped
       # from the host to the container.
       - name: Test Player
+        timeout-minutes: 30
         run: |
           # Use of an array keeps elements intact, and allows an element to
           # contain spaces without being expanded into multiple arguments in a