diff --git a/Makefile b/Makefile
index 8603b27a835754..d4d21b077456c4 100644
--- a/Makefile
+++ b/Makefile
@@ -295,8 +295,8 @@ v8:
 jstest: build-addons build-js-native-api-tests build-node-api-tests ## Runs addon tests and JS tests
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
 		--skip-tests=$(CI_SKIP_TESTS) \
-		$(CI_JS_SUITES) \
-		$(CI_NATIVE_SUITES)
+		$(JS_SUITES) \
+		$(NATIVE_SUITES)
 
 .PHONY: tooltest
 tooltest:
@@ -489,9 +489,11 @@ test-all-valgrind: test-build
 test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run all test suites.
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test/*
 
+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 ?= addons js-native-api node-api
-CI_JS_SUITES ?= default benchmark
+CI_NATIVE_SUITES ?= $(NATIVE_SUITES)
+CI_JS_SUITES ?= $(JS_SUITES) benchmark
 ifeq ($(node_use_openssl), false)
 	CI_DOC := doctool
 else
@@ -650,8 +652,8 @@ test-with-async-hooks:
 	$(MAKE) build-node-api-tests
 	$(MAKE) cctest
 	NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
-		$(CI_JS_SUITES) \
-		$(CI_NATIVE_SUITES)
+		$(JS_SUITES) \
+		$(NATIVE_SUITES)
 
 
 .PHONY: test-v8
diff --git a/vcbuild.bat b/vcbuild.bat
index 9072d730f44762..f1916a2679d2a5 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -15,12 +15,14 @@ if /i "%1"=="/?" goto help
 
 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=addons js-native-api node-api
-set CI_JS_SUITES=default benchmark
+set "CI_NATIVE_SUITES=%NATIVE_SUITES%"
+set "CI_JS_SUITES=%JS_SUITES% benchmark"
 set CI_DOC=doctool
 @rem Same as the test-ci target in Makefile
-set "common_test_suites=%CI_JS_SUITES% %CI_NATIVE_SUITES% %CI_DOC%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1"
+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"
 
 @rem Process arguments.
 set config=Release