--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java	Tue Sep 10 14:57:03 2019 -0400
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java	Wed Sep 11 13:26:36 2019 -0400
@@ -133,8 +133,7 @@
     public PackageType packageType() {
         return getArgumentValue("--package-type",
                 () -> PackageType.DEFAULT,
-                (v) -> ("app-image".equals(v)) ? PackageType.IMAGE :
-                     PACKAGE_TYPES.get(v));
+                (v) -> PACKAGE_TYPES.get(v));
     }
 
     public Path outputDir() {
@@ -173,8 +172,8 @@
     public static JPackageCommand helloAppImage() {
         JPackageCommand cmd = new JPackageCommand();
         cmd.setDefaultInputOutput().setDefaultAppName();
+        PackageType.IMAGE.applyTo(cmd);
         HelloApp.addTo(cmd);
-        (PackageType.IMAGE).applyTo(cmd);
         return cmd;
     }
 
@@ -359,7 +358,7 @@
                 @Override
                 public Map<String, PackageType> get() {
                     Map<String, PackageType> reply = new HashMap<>();
-                    for (PackageType type : PackageType.NATIVE) {
+                    for (PackageType type : PackageType.values()) {
                         reply.put(type.getName(), type);
                     }
                     return reply;