diff --git a/.github/actions/setup_test_action/action.yml b/.github/actions/setup_test_action/action.yml
index 1b18c9db4..ba5441480 100644
--- a/.github/actions/setup_test_action/action.yml
+++ b/.github/actions/setup_test_action/action.yml
@@ -24,7 +24,9 @@ runs:
       run: chmod +x gradlew
     - name: Install Firebase tools
       shell: bash
-      run: npm install -g firebase-tools
+      run: npm install -g firebase-tools wait-on
     - name: Start Firebase emulator
       shell: bash
-      run: "firebase emulators:start --config=./test/firebase.json &"
\ No newline at end of file
+      run: |
+        firebase emulators:start --config=./test/firebase.json &
+        wait-on http://127.0.0.1:9099
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 31d9d58e2..63fb749a0 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -66,6 +66,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup test environment
         uses: ./.github/actions/setup_test_action
+        timeout-minutes: 10
       - name: Run JS Tests
         run: ./gradlew cleanTest jsTest
       - name: Upload JS test artifact
@@ -89,14 +90,13 @@ jobs:
       - uses: actions/checkout@v3
       - name: Cocoapods cache
         uses: actions/cache@v3
-        id: cocoapods-cache
         with:
           path: |
             ~/.cocoapods
             ~/Library/Caches/CocoaPods
             */build/cocoapods
             */build/classes
-          key: cocoapods-cache
+          key: cocoapods-cache-v2
       - name: Setup test environment
         uses: ./.github/actions/setup_test_action
       - name: Run iOS Tests
@@ -112,4 +112,4 @@ jobs:
         if: failure()
         with:
           name: "Firebase Debug Log"
-          path: "**/firebase-debug.log"
+          path: "**/firebase-debug.log"
\ No newline at end of file