diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ea6699..db5ea33 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        neovim_version: ['v0.9.5', 'v0.10.0' ]
+        neovim_version:
+          - 'v0.9.5'
+          # - 'v0.10.0'
 
     env:
       NEOVIM_VERSION: ${{ matrix.neovim_version }}
@@ -40,8 +42,20 @@ jobs:
       - name: Download nvim-test
         run: make nvim-test
 
+      - name: Download nvim-treesitter
+        run: make nvim-treesitter
+
+      - name: Parsers Cache
+        uses: actions/cache@v4
+        with:
+          path: ./nvim-treesitter/parser/
+          key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
+            './nvim-treesitter/lockfile.json',
+            './nvim-treesitter/lua/nvim-treesitter/install.lua',
+            './nvim-treesitter/lua/nvim-treesitter/parsers.lua') }}
+
       - name: Install parsers
-        run: make parsers NEOVIM_VERSION=$NEOVIM_VERSION
+        run: make parsers
 
       - name: Run Test
-        run: make test NEOVIM_VERSION=$NEOVIM_VERSION
+        run: make test
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 09eabe6..834761a 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -35,12 +35,10 @@ jobs:
       - name: Download nvim-treesitter
         run: make nvim-treesitter
 
-      - name: Setup Parsers Cache
-        id: parsers-cache
+      - name: Parsers Cache
         uses: actions/cache@v4
         with:
-          path: |
-            ./nvim-treesitter/parser/
+          path: ./nvim-treesitter/parser/
           key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
             './nvim-treesitter/lockfile.json',
             './nvim-treesitter/lua/nvim-treesitter/install.lua',
diff --git a/Makefile b/Makefile
index d6098a1..d9d0444 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 .DEFAULT_GOAL := test
 
-NEOVIM_VERSION := v0.9.5
+NEOVIM_VERSION ?= v0.9.5
+NEOVIM_RUNNER_VERSION ?= v0.10.0
 
 NVIM_TS_SHA ?= 98460428
 
@@ -16,14 +17,14 @@ nvim-treesitter:
 
 nvim-test:
 	git clone https://github.com/lewis6991/nvim-test
-	nvim-test/bin/nvim-test --init
-		--runner_version $(NEOVIM_VERSION) \
+	nvim-test/bin/nvim-test --init \
+		--runner_version $(NEOVIM_RUNNER_VERSION) \
 		--target_version $(NEOVIM_VERSION)
 
 .PHONY: test
 test: nvim-test nvim-treesitter
 	nvim-test/bin/nvim-test test \
-		--runner_version $(NEOVIM_VERSION) \
+		--runner_version $(NEOVIM_RUNNER_VERSION) \
 		--target_version $(NEOVIM_VERSION) \
 		--lpath=$(PWD)/lua/?.lua \
 		--filter="$(FILTER)" \
@@ -31,7 +32,7 @@ test: nvim-test nvim-treesitter
 
 .PHONY: parsers
 parsers: nvim-test nvim-treesitter
-	$(XDG_DATA_HOME)/nvim-test/nvim-test-$(NEOVIM_VERSION)/bin/nvim \
+	$(XDG_DATA_HOME)/nvim-test/nvim-runner-$(NEOVIM_RUNNER_VERSION)/bin/nvim \
 		--clean -u NONE -c 'source install_parsers.lua'
 
 lint: