--- old/test/tools/pack200/MultiVersion.java	Mon Nov 16 14:08:34 2015
+++ new/test/tools/pack200/MultiVersion.java	Mon Nov 16 14:08:34 2015
@@ -71,7 +71,7 @@
             tcwd = new File(cwd, directory);
             metaInfDir = mkdir(new File(tcwd, "META-INF"));
             versionsDir = mkdir(new File(metaInfDir, "versions"));
-            manifestFile = new File(metaInfDir, "manifest.mf");
+            manifestFile = new File(tcwd, "manifest.tmp");
             List<String> scratch = new ArrayList<>();
             scratch.add("Multi-Release: true");
             Utils.createFile(manifestFile, scratch);
@@ -100,7 +100,6 @@
                         "-C",
                         tcwd.getAbsolutePath(),
                         ".");
-
                 File outFile = new File(tcwd, "test-repacked" + Utils.JAR_FILE_EXT);
                 List<String> cmdsList = new ArrayList<>();
 
@@ -133,9 +132,9 @@
         @Override
         void emitClassFiles() throws Exception {
             emitClassFile("");
-            emitClassFile("6.0");
-            emitClassFile("7.0");
-            emitClassFile("8.0");
+            emitClassFile("7");
+            emitClassFile("8");
+            emitClassFile("9");
         }
 
         /*
@@ -156,15 +155,15 @@
 
             scratch.add("package pkg;");
             switch (version) {
-                case "6.0":
+                case "7":
                     scratch.add("public class Foo {");
                     scratch.add("public static final class Bar {}");
                     break;
-                case "7.0":
+                case "8":
                     scratch.add("public abstract class Foo {");
                     scratch.add("public final class Bar {}");
                     break;
-                case "8.0":
+                case "9":
                     scratch.add("public interface Foo {");
                     scratch.add("public final class Bar {}");
                     break;
@@ -194,7 +193,7 @@
         @Override
         void emitClassFiles() throws Exception {
             emitClassFile("");
-            emitClassFile("8.0");
+            emitClassFile("8");
         }
 
         /*
@@ -218,7 +217,7 @@
             final String fname2 = "AbNormal";
             final File srcFile2 = new File(srcDir, fname2 + Utils.JAVA_FILE_EXT);
             switch (version) {
-                case "8.0":
+                case "8":
                     scratch.clear();
                     scratch.add("import java.io.IOException;");
                     scratch.add("public interface " + fname1 + "{");