diff --git a/.github/workflows/deploy-and-test-production.yaml b/.github/workflows/deploy-production.yaml
similarity index 93%
rename from .github/workflows/deploy-and-test-production.yaml
rename to .github/workflows/deploy-production.yaml
index b7b7dada..84484169 100644
--- a/.github/workflows/deploy-and-test-production.yaml
+++ b/.github/workflows/deploy-production.yaml
@@ -1,4 +1,4 @@
-name: Deploy and Test Production
+name: Deploy to Production
 
 on:
   pull_request:
diff --git a/.github/workflows/deploy-and-test-staging.yaml b/.github/workflows/deploy-staging.yaml
similarity index 60%
rename from .github/workflows/deploy-and-test-staging.yaml
rename to .github/workflows/deploy-staging.yaml
index c9e8193c..7fa8eb5d 100644
--- a/.github/workflows/deploy-and-test-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -1,4 +1,4 @@
-name: Deploy and Test Staging
+name: Deploy to Staging
 
 on:
   pull_request:
@@ -21,12 +21,3 @@ jobs:
       environment: staging-for-deploy
       branch: ${{ github.ref }}
       firebase_project: ${{ vars.FIREBASE_PROJECT_STAGING }}
-
-  test-staging:
-    needs: deploy-staging
-    uses: ./.github/workflows/firebase-test.yaml
-    secrets: inherit
-    with:
-      environment: staging-for-test
-      github_ref: ${{ github.ref }}
-      firebase_project: ${{ vars.FIREBASE_PROJECT_STAGING }}
diff --git a/.github/workflows/test-staging.yaml b/.github/workflows/test-staging.yaml
new file mode 100644
index 00000000..ed48bc02
--- /dev/null
+++ b/.github/workflows/test-staging.yaml
@@ -0,0 +1,23 @@
+name: Test Staging
+
+on:
+  pull_request:
+    branches: staging
+  push:
+    branches: staging
+
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+
+  test-staging:
+    uses: ./.github/workflows/firebase-test.yaml
+    secrets: inherit
+    with:
+      environment: staging-for-deploy
+      github_ref: ${{ github.ref }}
+      firebase_project: ${{ vars.FIREBASE_PROJECT_STAGING }}