--- /dev/null	2019-11-18 21:26:48.000000000 -0500
+++ new/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.java	2019-11-18 21:26:45.296293800 -0500
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package jdk.jpackage.test;
+
+
+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");
+
+    JavaTool(String name) {
+        this.name = name;
+        this.path = Path.of(System.getProperty("java.home")).resolve(
+                relativePathInJavaHome()).toAbsolutePath().normalize();
+        if (!path.toFile().exists()) {
+            throw new RuntimeException(String.format(
+                    "Unable to find tool [%s] at path=[%s]", name, path));
+        }
+    }
+
+    Path getPath() {
+        return path;
+    }
+
+    public ToolProvider asToolProvider() {
+        if (this == JPACKAGE) {
+            return ToolProviderFactory.findFirst("jpackage").orElseThrow(
+                    () -> new RuntimeException("jpackage tool not found"));
+        } else {
+            return ToolProvider.findFirst(name).orElse(null);
+        }
+    }
+
+    Path relativePathInJavaHome() {
+        Path path = Path.of("bin", name);
+        if (TKit.isWindows()) {
+            path = path.getParent().resolve(path.getFileName().toString() + ".exe");
+        }
+        return path;
+    }
+
+    private Path path;
+    private String name;
+}