--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.java	Wed Nov 06 07:20:07 2019 -0500
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.java	Fri Nov 08 14:53:03 2019 -0500
@@ -27,6 +27,7 @@
 
 import java.nio.file.Path;
 import java.util.spi.ToolProvider;
+import jdk.incubator.jpackage.ToolProviderFactory;
 
 public enum JavaTool {
     JAVA("java"), JAVAC("javac"), JPACKAGE("jpackage"), JAR("jar"), JLINK("jlink");
@@ -46,7 +47,12 @@
     }
 
     public ToolProvider asToolProvider() {
-        return ToolProvider.findFirst(name).orElse(null);
+        if (this == JPACKAGE) {
+            return ToolProviderFactory.findFirst("jpackage").orElseThrow(
+                    () -> new RuntimeException("jpackage tool not found"));
+        } else {
+            return ToolProvider.findFirst(name).orElse(null);
+        }
     }
 
     Path relativePathInJavaHome() {