--- a/langtools/test/Makefile	Thu Dec 01 11:16:45 2016 +0000
+++ b/langtools/test/Makefile	Thu Dec 01 15:10:32 2016 +0100
@@ -161,6 +161,9 @@
 JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx768m
 JTREG_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION)
 
+# Retain all files for failing tests
+JTREG_OPTIONS += -retain:fail,error
+
 ifdef EXTRA_JTREG_OPTIONS
   JTREG_OPTIONS += $(EXTRA_JTREG_OPTIONS)
 endif