diff --git a/.changeset/spicy-walls-judge.md b/.changeset/spicy-walls-judge.md
new file mode 100644
index 00000000000..a845151cc84
--- /dev/null
+++ b/.changeset/spicy-walls-judge.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 67de13e4891..6924ef707a5 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -19,6 +19,7 @@ jobs:
 
   test:
     runs-on: buildjet-4vcpu-ubuntu-2204
+    timeout-minutes: 25
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -73,10 +74,12 @@ jobs:
           test-script: pnpm ci:test
           prnumber: ${{ steps.findPr.outputs.number }}
           base-coverage-file: coverage-reports/report.master.json
+
   live-tests:
     name: Run Live Tests
     if: github.head_ref == 'changeset-release/master'
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     steps:
       - name: Checkout
         uses: actions/checkout@v3