--- old/test/jdk/tools/jpackage/linux/LicenseTypeTest.java	2019-09-18 10:35:08.525141600 -0400
+++ new/test/jdk/tools/jpackage/linux/LicenseTypeTest.java	2019-09-18 10:35:07.055763700 -0400
@@ -21,6 +21,7 @@
  * questions.
  */
 
+import jdk.jpackage.test.Test;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 
@@ -44,14 +45,16 @@
  */
 public class LicenseTypeTest {
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
         final String LICENSE_TYPE = "JP_LICENSE_TYPE";
 
-        new PackageTest().forTypes(PackageType.LINUX_RPM).configureHelloApp()
-        .addInitializer(cmd -> {
-            cmd.addArguments("--linux-rpm-license-type", LICENSE_TYPE);
-        })
-        .addBundlePropertyVerifier("License", LICENSE_TYPE)
-        .run();
+        Test.run(args, () -> {
+            new PackageTest().forTypes(PackageType.LINUX_RPM).configureHelloApp()
+            .addInitializer(cmd -> {
+                cmd.addArguments("--linux-rpm-license-type", LICENSE_TYPE);
+            })
+            .addBundlePropertyVerifier("License", LICENSE_TYPE)
+            .run();
+        });
     }
 }