--- a/hotspot/make/windows/makefiles/defs.make	Thu May 10 15:44:19 2012 +0200
+++ b/hotspot/make/windows/makefiles/defs.make	Wed May 16 12:47:27 2012 -0700
@@ -143,7 +143,9 @@
 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