diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index fdfb38097..bc4a18d52 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -55,11 +55,8 @@ jobs:
       ALLOWED_INSTALLATION_FAILURES: ${{ matrix.os == 'windows-latest' && 'rnoweb' }}
     steps:
       - uses: actions/checkout@v4
+      - uses: tree-sitter/setup-action/cli@v1
       - uses: ilammy/msvc-dev-cmd@v1
-      - uses: actions/setup-node@v4
-
-      - name: Install tree-sitter CLI
-        run: npm i -g tree-sitter-cli
 
       - name: Install and prepare Neovim
         env:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8d71edeb0..6c4ad9578 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -27,10 +27,7 @@ jobs:
       CC: ${{ matrix.cc }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-
-      - name: Install tree-sitter CLI
-        run: npm i -g tree-sitter-cli
+      - uses: tree-sitter/setup-action/cli@v1
 
       - name: Test Dependencies
         run: |