diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index f01dee3..bc6c0cf 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -6,20 +6,17 @@ jobs:
   grammar-tests:
     name: Grammar Tests
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./tree-sitter-p4
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v4
       - uses: tree-sitter/setup-action@v2
         with:
           install-cli: true
-      - working-directory: ./tree-sitter-p4
-        shell: sh
-        run: pwd && ls
-      - uses: tree-sitter/parser-test-action@v3
-        with:
-          generate: false
-          working-directory: ./tree-sitter-p4
-          test-parser-cmd: pwd
+      # Because our tree-sitter code is in a subdirectory,
+      # and working-directory does not apply to uses, we
+      # are forced to specify calls to the CI ourselves.
+      # See https://github.com/orgs/community/discussions/25742
+      - run: tree-sitter generate
+        working-directory: ./tree-sitter-p4
+      - run: tree-sitter test
+        working-directory: ./tree-sitter-p4