diff -r 2c43b89b1679 -r 3bf53ffa9ae7 test/jdk/tools/jpackage/windows/WinMenuGroupTest.java
--- a/test/jdk/tools/jpackage/windows/WinMenuGroupTest.java	Wed Oct 16 09:57:23 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/WinMenuGroupTest.java	Wed Oct 16 10:32:08 2019 -0400
@@ -24,6 +24,7 @@
 import jdk.jpackage.test.TKit;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.Annotations.Test;
 
 /**
  * Test --win-menu and --win-menu-group parameters.
@@ -42,18 +43,19 @@
  * @build jdk.jpackage.test.*
  * @requires (os.family == "windows")
  * @modules jdk.jpackage/jdk.jpackage.internal
- * @run main/othervm/timeout=360 -Xmx512m WinMenuGroupTest
+ * @compile WinMenuGroupTest.java
+ * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=WinMenuGroupTest
  */
 
 public class WinMenuGroupTest {
-    public static void main(String[] args) {
-        TKit.run(args, () -> {
-            new PackageTest()
-            .forTypes(PackageType.WINDOWS)
-            .configureHelloApp()
-            .addInitializer(cmd -> cmd.addArguments(
-                    "--win-menu", "--win-menu-group", "WinMenuGroupTest_MenuGroup"))
-            .run();
-        });
+    @Test
+    public static void test() {
+        new PackageTest()
+        .forTypes(PackageType.WINDOWS)
+        .configureHelloApp()
+        .addInitializer(cmd -> cmd.addArguments(
+                "--win-menu", "--win-menu-group", "WinMenuGroupTest_MenuGroup"))
+        .run();
     }
 }