diff --git a/ext/opcache/config.w32 b/ext/opcache/config.w32
index d0af7258ac66f..16c137f47a810 100644
--- a/ext/opcache/config.w32
+++ b/ext/opcache/config.w32
@@ -1,10 +1,9 @@
 ARG_ENABLE("opcache", "whether to enable Zend OPcache support", "yes");
+ARG_ENABLE("opcache-jit", "whether to enable JIT", "yes");
 
 
 if (PHP_OPCACHE != "no") {
 
-	ARG_ENABLE("opcache-jit", "whether to enable JIT", "yes");
-
 	ZEND_EXTENSION('opcache', "\
 		ZendAccelerator.c \
 		zend_accelerator_blacklist.c \
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 043f18b275b9d..6735765de748c 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -355,15 +355,15 @@ if (PHP_SECURITY_FLAGS == "yes") {
 	ADD_FLAG("LDFLAGS", "/NXCOMPAT /DYNAMICBASE ");
 }
 
+ARG_WITH("uncritical-warn-choke", "Disable some uncritical warnings", "yes");
+ARG_ENABLE("sanitizer", "Enable ASan and UBSan extensions", "no");
 if (CLANG_TOOLSET) {
-	ARG_WITH("uncritical-warn-choke", "Disable some uncritical warnings", "yes");
 	if (PHP_UNCRITICAL_WARN_CHOKE != "no") {
 		ADD_FLAG("CFLAGS", "-Wno-ignored-attributes -Wno-deprecated-declarations -Wno-missing-braces " +
 		"-Wno-logical-op-parentheses -Wno-msvc-include -Wno-invalid-source-encoding -Wno-unknown-pragmas " +
 		"-Wno-unused-command-line-argument -Wno-unused-function -Wno-ignored-pragma-optimize");
 	}
 
-	ARG_ENABLE("sanitizer", "Enable ASan and UBSan extensions", "no");
 	if (PHP_SANITIZER == "yes") {
 		if (COMPILER_NUMERIC_VERSION < 500) {
 			ERROR("Clang at least 5.0.0 required for sanitation plugins");