diff -r d1fe86ccc832 -r e90068e7afa1 test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.java
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.java	Tue Nov 19 18:45:08 2019 -0500
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.java	Wed Nov 20 10:17:37 2019 -0500
@@ -27,7 +27,6 @@
 
 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");
@@ -47,12 +46,7 @@
     }
 
     public ToolProvider asToolProvider() {
-        if (this == JPACKAGE) {
-            return ToolProviderFactory.findFirst("jpackage").orElseThrow(
-                    () -> new RuntimeException("jpackage tool not found"));
-        } else {
-            return ToolProvider.findFirst(name).orElse(null);
-        }
+        return ToolProvider.findFirst(name).orElse(null);
     }
 
     Path relativePathInJavaHome() {