--- old/test/jdk/tools/jpackage/linux/AppCategoryTest.java	2019-09-18 10:34:49.047004500 -0400
+++ new/test/jdk/tools/jpackage/linux/AppCategoryTest.java	2019-09-18 10:34:47.628892200 -0400
@@ -21,6 +21,7 @@
  * questions.
  */
 
+import jdk.jpackage.test.Test;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 
@@ -49,19 +50,21 @@
  */
 public class AppCategoryTest {
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
         final String CATEGORY = "Foo";
 
-        new PackageTest()
-        .forTypes(PackageType.LINUX)
-        .configureHelloApp()
-        .addInitializer(cmd -> {
-            cmd.addArguments("--linux-app-category", CATEGORY);
-        })
-        .forTypes(PackageType.LINUX_DEB)
-        .addBundlePropertyVerifier("Section", CATEGORY)
-        .forTypes(PackageType.LINUX_RPM)
-        .addBundlePropertyVerifier("Group", CATEGORY)
-        .run();
+        Test.run(args, () -> {
+            new PackageTest()
+            .forTypes(PackageType.LINUX)
+            .configureHelloApp()
+            .addInitializer(cmd -> {
+                cmd.addArguments("--linux-app-category", CATEGORY);
+            })
+            .forTypes(PackageType.LINUX_DEB)
+            .addBundlePropertyVerifier("Section", CATEGORY)
+            .forTypes(PackageType.LINUX_RPM)
+            .addBundlePropertyVerifier("Group", CATEGORY)
+            .run();
+        });
     }
 }