--- a/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java	Wed Jan 31 10:34:59 2018 -0800
+++ b/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java	Wed Jan 31 11:25:34 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8144355 8144062 8176709
+ * @bug 8144355 8144062 8176709 8194070
  * @summary Test aliasing additions to ZipFileSystem for multi-release jar files
  * @library /lib/testlibrary/java/util/jar
  * @build Compiler JarBuilder CreateMultiReleaseTestJars
@@ -92,9 +92,9 @@
                 {"0", 8},
                 {"8", 8},
                 {"9", 9},
-                {"10", 10},
-                {"11", 10},
-                {"50", 10}
+                {Integer.toString(MAJOR_VERSION), MAJOR_VERSION},
+                {Integer.toString(MAJOR_VERSION+1), MAJOR_VERSION},
+                {"50", MAJOR_VERSION}
         };
     }
 
@@ -105,9 +105,9 @@
                 {new Integer(0), 8},
                 {new Integer(8), 8},
                 {new Integer(9), 9},
-                {new Integer(10), 10},
-                {new Integer(11), 10},
-                {new Integer(100), 10}
+                {new Integer(MAJOR_VERSION), MAJOR_VERSION},
+                {new Integer(MAJOR_VERSION + 1), MAJOR_VERSION},
+                {new Integer(100), MAJOR_VERSION}
         };
     }
 
@@ -116,9 +116,8 @@
         return new Object[][] {
                 {Version.parse("8"),    8},
                 {Version.parse("9"),    9},
-                {Version.parse("10"),  10},
-                {Version.parse("11"),  10},
-                {Version.parse("100"), 10}
+                {Version.parse("11"),  MAJOR_VERSION},
+                {Version.parse("100"), MAJOR_VERSION}
         };
     }
 
@@ -168,8 +167,8 @@
 
     @Test
     public void testShortJar() throws Throwable {
-        integerEnv.put("multi-release", Integer.valueOf(10));
-        runTest(smruri, integerEnv, 10);
+        integerEnv.put("multi-release", Integer.valueOf(MAJOR_VERSION));
+        runTest(smruri, integerEnv, MAJOR_VERSION);
         integerEnv.put("multi-release", Integer.valueOf(9));
         runTest(smruri, integerEnv, 8);
     }