--- old/test/jdk/tools/jpackage/windows/WinMenuGroupTest.java	2019-09-18 10:36:58.307689200 -0400
+++ new/test/jdk/tools/jpackage/windows/WinMenuGroupTest.java	2019-09-18 10:36:56.797502500 -0400
@@ -21,6 +21,7 @@
  * questions.
  */
 
+import jdk.jpackage.test.Test;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 
@@ -40,16 +41,18 @@
  * @library ../helpers
  * @requires (os.family == "windows")
  * @modules jdk.jpackage/jdk.jpackage.internal
- * @run main/othervm -Xmx512m WinMenuGroupTest
+ * @run main/othervm/timeout=360 -Xmx512m WinMenuGroupTest
  */
 
 public class WinMenuGroupTest {
     public static void main(String[] args) {
-        new PackageTest()
-        .forTypes(PackageType.WINDOWS)
-        .configureHelloApp()
-        .addInitializer(cmd -> cmd.addArguments(
-                "--win-menu", "--win-menu-group", "WinMenuGroupTest_MenuGroup"))
-        .run();
+        Test.run(args, () -> {
+            new PackageTest()
+            .forTypes(PackageType.WINDOWS)
+            .configureHelloApp()
+            .addInitializer(cmd -> cmd.addArguments(
+                    "--win-menu", "--win-menu-group", "WinMenuGroupTest_MenuGroup"))
+            .run();
+        });
     }
 }