diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
deleted file mode 100644
index 1334a42..0000000
--- a/.github/workflows/lint.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Lint
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - "*"
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-      - uses: bahmutov/npm-install@v1
-      - name: ESLint
-        run: npm run lint
\ No newline at end of file
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2c02724..9010665 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -2,7 +2,7 @@ name: Test
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
       - "*"
@@ -10,14 +10,20 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-      - uses: bahmutov/npm-install@v1
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v4
+        with:
+          cache: pnpm
+      - name: Install
+        run: pnpm install
+      - name: ESLint
+        run: pnpm run lint
       - name: Generate grammar
-        run: npm run generate
+        run: pnpm run generate
       - name: Verify generation
         uses: "chainguard-dev/actions/nodiff@main"
         with:
           fixup-command: "npm run generate"
       - name: Test corpus
-        run: npm run test
\ No newline at end of file
+        run: pnpm run test