--- a/test/jdk/tools/jpackage/windows/WinPerUserInstallTest.java	Mon Sep 16 19:24:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/WinPerUserInstallTest.java	Tue Sep 24 13:41:16 2019 -0400
@@ -21,6 +21,7 @@
  * questions.
  */
 
+import jdk.jpackage.test.Test;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 
@@ -39,18 +40,20 @@
  * @library ../helpers
  * @requires (os.family == "windows")
  * @modules jdk.jpackage/jdk.jpackage.internal
- * @run main/othervm -Xmx512m WinPerUserInstallTest
+ * @run main/othervm/timeout=360 -Xmx512m WinPerUserInstallTest
  */
 
 public class WinPerUserInstallTest {
     public static void main(String[] args) {
-        new PackageTest()
-        .forTypes(PackageType.WINDOWS)
-        .configureHelloApp()
-        .addInitializer(cmd -> cmd.addArguments(
-                "--win-menu",
-                "--win-menu-group", "WinPerUserInstallTest_MenuGroup",
-                "--win-per-user-install"))
-        .run();
+        Test.run(args, () -> {
+            new PackageTest()
+            .forTypes(PackageType.WINDOWS)
+            .configureHelloApp()
+            .addInitializer(cmd -> cmd.addArguments(
+                    "--win-menu",
+                    "--win-menu-group", "WinPerUserInstallTest_MenuGroup",
+                    "--win-per-user-install"))
+            .run();
+        });
     }
 }