diff --git a/Makefile b/Makefile
index 73a9fcf4031537..6b3818b01d5dee 100644
--- a/Makefile
+++ b/Makefile
@@ -495,8 +495,8 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a
 JS_SUITES ?= default
 NATIVE_SUITES ?= addons js-native-api node-api
 # CI_* variables should be kept synchronized with the ones in vcbuild.bat
-CI_NATIVE_SUITES ?= $(NATIVE_SUITES)
-CI_JS_SUITES ?= $(JS_SUITES) benchmark
+CI_NATIVE_SUITES ?= $(NATIVE_SUITES) benchmark
+CI_JS_SUITES ?= $(JS_SUITES)
 ifeq ($(node_use_openssl), false)
 	CI_DOC := doctool
 else
@@ -507,7 +507,7 @@ endif
 # Build and test addons without building anything else
 # Related CI job: node-test-commit-arm-fanned
 test-ci-native: LOGLEVEL := info
-test-ci-native: | test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
+test-ci-native: | benchmark/napi/.buildstamp test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
 		--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
 		$(TEST_CI_ARGS) $(CI_NATIVE_SUITES)
diff --git a/vcbuild.bat b/vcbuild.bat
index 99ac46322bb839..79214217e5bd54 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -18,8 +18,8 @@ cd %~dp0
 set JS_SUITES=default
 set NATIVE_SUITES=addons js-native-api node-api
 @rem CI_* variables should be kept synchronized with the ones in Makefile
-set "CI_NATIVE_SUITES=%NATIVE_SUITES%"
-set "CI_JS_SUITES=%JS_SUITES% benchmark"
+set "CI_NATIVE_SUITES=%NATIVE_SUITES% benchmark"
+set "CI_JS_SUITES=%JS_SUITES%"
 set CI_DOC=doctool
 @rem Same as the test-ci target in Makefile
 set "common_test_suites=%JS_SUITES% %NATIVE_SUITES%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1"