--- old/test/Makefile	Mon Feb 27 11:33:16 2012
+++ new/test/Makefile	Mon Feb 27 11:33:15 2012
@@ -395,6 +395,7 @@
 ifeq ($(MODULE_BUILD),true)
 ifndef NO_EXCLUDES_MODULES
 PROBLEM_LISTS += $(MODULE_IMAGE_PROBLEM_LIST)
+PROBLEM_LISTS += $(wildcard closed/$(MODULE_IMAGE_PROBLEM_LIST))
 endif
 endif
 
@@ -630,7 +631,7 @@
 	$(call RunAgentvmBatch)
 
 # jdk_jigsaw is included in jprt.properties but we only want to
-# run them when testing the jdk-module-image. 
+# run them when testing the jdk-module-image.
 # java/lang/module and java/lang/reflect/Module tests are tagged
 # with the "modules" keyword so that they are excluded when testing
 # legacy image.
--- old/test/ModulesProblemList.txt	Mon Feb 27 11:33:16 2012
+++ new/test/ModulesProblemList.txt	Mon Feb 27 11:33:16 2012
@@ -25,7 +25,7 @@
 #
 
 ############################################################################
-# This file is intended to temporarily exclude test failures due 
+# This file is intended to temporarily exclude test failures due
 # to jdk modularization.  We will remove this file when the major
 # known issues of the jdk modularization are fixed.
 #
@@ -57,12 +57,6 @@
 # Could not determine codeBase for java.home
 javax/management/MBeanInfo/NotificationInfoTest.java        generic-all
 
-#Caused by: java.security.NoSuchAlgorithmException: SunTlsRsaPremasterSecret KeyGenerator not available
-closed/javax/management/remote/mandatory/sslStub/SSLSocketParametersTest.sh generic-all
-
-closed/sun/management/snmp/generic/GenericTest.sh              generic-all
-closed/sun/management/snmp/snmpCounter64/SnmpCounter64Test.sh  generic-all
-
 ############################################################################
 
 # jdk_math
@@ -108,7 +102,6 @@
 # This test sets to Turkish language without resetting it when exit
 # that causes other tests to fail.  Exclude for now.
 sun/nio/cs/Test4206507.java                             generic-all
-closed/sun/nio/cs/sunio/Test4206507.java                generic-all
 
 ############################################################################
 
@@ -227,7 +220,7 @@
 com/sun/tools/extcheck/TestExtcheckArgs.java   	generic-all
 tools/launcher/ExecutionEnvironment.java   	generic-all
 
-# Test bugs - should file a CR 
+# Test bugs - should file a CR
 tools/launcher/VersionCheck.java   	        generic-all
 # /var/tmp  not writeable
 tools/jar/ChangeDir.java                        generic-all