--- a/jdk/test/ProblemList.txt	Thu Jul 13 17:45:10 2017 -0700
+++ b/jdk/test/ProblemList.txt	Fri Jul 14 14:43:04 2017 +0100
@@ -264,9 +264,6 @@
 tools/jimage/JImageListTest.java                                8170120 generic-all
 tools/jimage/JImageVerifyTest.java                              8170120 generic-all
 
-tools/schemagen/MultiReleaseJarTest.java                        8174692 generic-all
-tools/wsgen/MultiReleaseJarTest.java                            8174692 generic-all
-
 ############################################################################
 
 # jdk_jdi

--- a/jdk/test/tools/schemagen/MultiReleaseJarTest.java	Thu Jul 13 17:45:10 2017 -0700
+++ b/jdk/test/tools/schemagen/MultiReleaseJarTest.java	Fri Jul 14 14:43:04 2017 +0100
@@ -56,7 +56,7 @@
 
     @DataProvider(name = "jarFiles")
     public Object[][] jarFiles() {
-        return new Object[][]{{"MV_BOTH.jar", 9},
+        return new Object[][]{{"MV_BOTH.jar", Math.min(10, Runtime.version().major())},
                 {"MV_ONLY_9.jar", 9},
                 {"NON_MV.jar", 8}};
     }

--- a/jdk/test/tools/wsgen/MultiReleaseJarTest.java	Thu Jul 13 17:45:10 2017 -0700
+++ b/jdk/test/tools/wsgen/MultiReleaseJarTest.java	Fri Jul 14 14:43:04 2017 +0100
@@ -56,7 +56,7 @@
 
     @DataProvider(name = "jarFiles")
     public Object[][] jarFiles() {
-        return new Object[][]{{"MV_BOTH.jar", 9},
+        return new Object[][]{{"MV_BOTH.jar", Math.min(10, Runtime.version().major())},
                 {"MV_ONLY_9.jar", 9},
                 {"NON_MV.jar", 8}};
     }