diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d8d13a74..5ef72d36 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,13 +1,13 @@
 name: Continuous Integration
 permissions: read-all
 
-on: [push, pull_request]
+on: [push, merge_group, pull_request]
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v2
         with:
           node-version: "20"
@@ -18,7 +18,7 @@ jobs:
     name: Build matrix for unit test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - id: read-matrix
         name: Read build matrix
         run: echo "::set-output name=matrix::`jq -c . test/unit/config/run_matrix.json`"
@@ -30,11 +30,14 @@ jobs:
     strategy:
       matrix: ${{ fromJSON(needs.build-matrix.outputs.matrix)[github.event_name] }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v2
         with:
           node-version: "20"
       - run: npm install
+      - name: Set Firefox path for macOS
+        if: ${{ runner.os == 'macOS' && matrix.browser == 'FirefoxWithFlags' }}
+        run: echo "FIREFOX_BIN=/Applications/Firefox.app/Contents/MacOS/firefox">> $GITHUB_ENV
       - name: Run test cases
         env:
           BROWSER: ${{ matrix.browser }}
diff --git a/test/unit/config/run_matrix.json b/test/unit/config/run_matrix.json
index d28e14b3..3eb8bc84 100644
--- a/test/unit/config/run_matrix.json
+++ b/test/unit/config/run_matrix.json
@@ -3,7 +3,24 @@
     "os": [
       "ubuntu-latest",
       "windows-latest",
-      "macos-latest"
+      "macos-13"
+    ],
+    "browser": [
+      "ChromeWithFlags",
+      "FirefoxWithFlags"
+    ],
+    "include": [
+      {
+        "os": "windows-latest",
+        "browser": "EdgeWithFlags"
+      }
+    ]
+  },
+  "merge_group": {
+    "os": [
+      "ubuntu-latest",
+      "windows-latest",
+      "macos-13"
     ],
     "browser": [
       "ChromeWithFlags",