diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 2d9f1eb..454f77f 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -6,9 +6,9 @@ jobs:
   grammar-tests:
     name: Grammar Tests
     runs-on: ubuntu-latest
+    uses: ./.github/workflows/treesitter.yaml
     steps:
       - uses: actions/checkout@v2
-      - uses: ./.github/workflows/treesitter.yaml
       # 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.
diff --git a/.github/workflows/treesitter.yaml b/.github/workflows/treesitter.yaml
index feaa572..6f0ae6f 100644
--- a/.github/workflows/treesitter.yaml
+++ b/.github/workflows/treesitter.yaml
@@ -14,6 +14,7 @@ jobs:
           install-cli: true
   generate-treesitter:
     name: Generate Grammar
+    runs-on: ubuntu-latest
     needs: install-treesitter
     steps:
       # Because our tree-sitter code is in a subdirectory,