diff --git a/make/windows/makefiles/defs.make b/make/windows/makefiles/defs.make
index 58e6a606e653e4eb5061de2be968549ab3cdb13b..a1c88284cc259f636b4c5f86c4adbe6fed904d03 100644
--- a/make/windows/makefiles/defs.make
+++ b/make/windows/makefiles/defs.make
@@ -143,7 +143,9 @@ _JUNK_ := $(shell \
 MAKE_ARGS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)
 
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-  ZIP_DEBUGINFO_FILES ?= 1
+  # Disable ZIP_DEBUGINFO_FILES by default because various tests are
+  # failing in nightly when the debug info files are ZIP'ed.
+  ZIP_DEBUGINFO_FILES ?= 0
 else
   ZIP_DEBUGINFO_FILES=0
 endif