--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.java	Fri Sep 06 17:42:06 2019 -0400
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.java	Tue Sep 10 09:18:19 2019 -0400
@@ -27,14 +27,15 @@
 
 import java.io.File;
 import java.nio.file.Path;
+import java.util.spi.ToolProvider;
 
 public enum JavaTool {
     JAVAC("javac"), JPACKAGE("jpackage"), JAR("jar");
-    private File path;
 
     JavaTool(String name) {
+        this.name = name;
         path = Path.of(System.getProperty("java.home"), "bin", name).toFile();
-        if (!path.exists()) {
+        if (Test.isWindows()) {
             path = new File(path.toString() + ".exe");
         }
         if (!path.exists()) {
@@ -46,4 +47,11 @@
     File getPath() {
         return path;
     }
+
+    ToolProvider asToolProvider() {
+        return ToolProvider.findFirst(name).orElse(null);
+    }
+
+    private File path;
+    private String name;
 }