--- a/hotspot/test/compiler/aot/AotCompiler.java	Thu Jan 19 08:10:11 2017 +0100
+++ b/hotspot/test/compiler/aot/AotCompiler.java	Thu Jan 05 08:37:10 2017 +0100
@@ -69,7 +69,7 @@
         extraopts.add("-classpath");
         extraopts.add(Utils.TEST_CLASS_PATH + File.pathSeparator + Utils.TEST_SRC);
         if (className != null && libName != null) {
-            OutputAnalyzer oa = launchCompiler(libName, className + ".class", extraopts, compileList);
+            OutputAnalyzer oa = launchCompiler(libName, className, extraopts, compileList);
             oa.shouldHaveExitValue(0);
         } else {
             printUsage();
@@ -100,6 +100,7 @@
             args.add("--compile-commands");
             args.add(file.toString());
         }
+        args.add("--classname");
         args.add(item);
         return launchJaotc(args, extraopts);
     }