diff -r 88224d833811 test/langtools/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java
--- a/test/langtools/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/test/langtools/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java	Wed Dec 06 08:47:03 2017 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug      4934778 4777599 6553182 8146427 8146475 8175055 8185371
- * @summary  Make sure that -help, -helpfile and -nohelp options work correctly.
+ * @summary  Make sure that --help, -helpfile and -nohelp options work correctly.
  * @author   jamieh
  * @library ../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -66,7 +66,7 @@
     void testWithOption() {
         javadoc("-d", "out1",
                 "-sourcepath", testSrc,
-                "-help",
+                "--help",
                 testSrc("Sample.java"));
         checkExit(Exit.OK);
 
diff -r 88224d833811 test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
--- a/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java	Wed Dec 06 08:47:03 2017 +0100
@@ -117,7 +117,7 @@
     }
 
     void usageTests(boolean xflag) {
-        String[] argarray = { xflag ? "-X" : "-help" };
+        String[] argarray = { xflag ? "-X" : "--help" };
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
         if (jdk.javadoc.internal.tool.Main.execute(argarray, pw) == 0) {
diff -r 88224d833811 test/langtools/jdk/javadoc/tool/ToolProviderTest.java
--- a/test/langtools/jdk/javadoc/tool/ToolProviderTest.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/test/langtools/jdk/javadoc/tool/ToolProviderTest.java	Wed Dec 06 08:47:03 2017 +0100
@@ -69,7 +69,7 @@
     public void testOneStream() throws Exception {
         StringWriter sw = new StringWriter();
         try (PrintWriter pw = new PrintWriter(sw)) {
-            int rc = javadoc.run(pw, pw, "-help");
+            int rc = javadoc.run(pw, pw, "--help");
             if (rc != 0) {
                 error("unexpected exit code: " + rc);
             }
@@ -86,7 +86,7 @@
         StringWriter swErr = new StringWriter();
         try (PrintWriter pwOut = new PrintWriter(swOut);
                 PrintWriter pwErr = new PrintWriter(swErr)) {
-            int rc = javadoc.run(pwOut, pwErr, "-help");
+            int rc = javadoc.run(pwOut, pwErr, "--help");
             if (rc != 0) {
                 error("unexpected exit code: " + rc);
             }
diff -r 88224d833811 test/langtools/tools/javap/InvalidOptions.java
--- a/test/langtools/tools/javap/InvalidOptions.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/test/langtools/tools/javap/InvalidOptions.java	Wed Dec 06 08:47:03 2017 +0100
@@ -42,7 +42,7 @@
     void run() throws Exception {
         test(2, "-b", "Error: unknown option: -b",
                       "Usage: javap <options> <classes>",
-                      "use -help for a list of possible options");
+                      "use --help for a list of possible options");
         if (errorCount > 0)
             throw new Exception(errorCount + " errors received");
     }
diff -r 88224d833811 test/langtools/tools/jdeps/MultiReleaseJar.java
--- a/test/langtools/tools/jdeps/MultiReleaseJar.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/test/langtools/tools/jdeps/MultiReleaseJar.java	Wed Dec 06 08:47:03 2017 +0100
@@ -118,7 +118,7 @@
         checkResult(r, false,
                 "Error: unknown option: -multi-release",
                 "Usage: jdeps <options> <path",
-                "use -h, -?, -help, or --help"
+                "use -h, -?, or --help"
         );
 
         r = run("jdeps -v -R -cp Version.jar --multi-release 9 test/Main.class");
--- a/test/jdk/tools/launcher/HelpFlagsTest.java	2017-11-28 11:50:56.961699000 +0100
+++ b/test/jdk/tools/launcher/HelpFlagsTest.java	2017-12-06 10:57:36.492607000 +0100
@@ -50,7 +50,6 @@
 
 public class HelpFlagsTest extends TestHelper {
 
-
     // Tools that should not be tested because a usage message is pointless.
     static final String[] TOOLS_NOT_TO_TEST = {
         "appletviewer",     // deprecated, don't test
@@ -87,9 +86,10 @@
         // * the tool prints a help message if the flag is specified
         // * this help message lists the flag
         // * the tool exits with exit code '0'.
-        boolean supportsQestionmark;
+        boolean supportsQuestionMark;
         boolean supportsH;
         boolean supportsHelp;
+
         // One tool returns with exit code != '0'.
         int exitcodeOfHelp;
 
@@ -102,6 +102,7 @@
         // The tools accepts legacy -help. -help should not be
         // documented in the usage message.
         boolean supportsLegacyHelp;
+
         // Java itself documents -help. -help prints to stderr,
         // while --help prints to stdout. Leave as is.
         boolean documentsLegacyHelp;
@@ -118,14 +119,14 @@
 
         ToolHelpSpec(String n, int q, int h, int hp, int ex1, int l, int dl, int ex2, int hangs) {
             toolname = n;
-            supportsQestionmark = ( q  == 1 ? true : false );
-            supportsH           = ( h  == 1 ? true : false );
-            supportsHelp        = ( hp == 1 ? true : false );
-            exitcodeOfHelp      = ex1;
+            supportsQuestionMark = ( q  == 1 ? true : false );
+            supportsH            = ( h  == 1 ? true : false );
+            supportsHelp         = ( hp == 1 ? true : false );
+            exitcodeOfHelp       = ex1;
 
-            supportsLegacyHelp  = (  l == 1 ? true : false );
-            documentsLegacyHelp = ( dl == 1 ? true : false );
-            exitcodeOfWrongFlag = ex2;
+            supportsLegacyHelp   = (  l == 1 ? true : false );
+            documentsLegacyHelp  = ( dl == 1 ? true : false );
+            exitcodeOfWrongFlag  = ex2;
 
             dontExecuteWithWrongFlags = ( hangs == 1 ? true : false );
         }
@@ -171,11 +172,19 @@
         new ToolHelpSpec("unpack200",   1,   1,   1,   0,         1,    0,     2,       0),   // -?, -h, --help, -help accepted but not documented.
     };
 
+    // Returns true if the file is not a tool.
+    static boolean notATool(String file) {
+        if (isWindows && !file.endsWith(EXE_FILE_EXT))
+            return true;
+        return false;
+    }
+
     // Returns true if tool is listed in TOOLS_NOT_TO_TEST.
     static boolean dontTestTool(String tool) {
         tool = tool.toLowerCase();
         for (String x : TOOLS_NOT_TO_TEST) {
-            if (tool.toLowerCase().startsWith(x)) return true;
+            if (tool.toLowerCase().startsWith(x))
+                return true;
         }
         return false;
     }
@@ -184,7 +194,8 @@
     static ToolHelpSpec getToolHelpSpec(String tool) {
         for (ToolHelpSpec x : jdkTools) {
             if (tool.toLowerCase().equals(x.toolname) ||
-                tool.toLowerCase().equals(x.toolname + ".exe")) return x;
+                tool.toLowerCase().equals(x.toolname + ".exe"))
+                return x;
         }
         return null;
     }
@@ -269,7 +280,10 @@
             result += "failed: " + f.getName() + " does not document " +
                 flag + " in help message.\n";
         }
-        if (!result.isEmpty()) { System.out.println(result); }
+
+        if (!result.isEmpty()) 
+            System.out.println(result);
+
         return result;
     }
 
@@ -285,7 +299,6 @@
             result = "failed: " + f.getName() + " -help has exit code " + tr.exitValue + ".\n";
         }
 
-
         // Check there is _no_ documentation of -help.
         boolean foundFlag = false;
         for (String y : tr.testOutput) {
@@ -298,7 +311,10 @@
             result += "failed: " + f.getName() + " does document -help " +
                 "in help message. This legacy flag should not be documented.\n";
         }
-        if (!result.isEmpty()) { System.out.println(result); }
+
+        if (!result.isEmpty())
+            System.out.println(result);
+
         return result;
     }
 
@@ -331,7 +347,10 @@
             result += "failed: " + f.getName() + " does document -help " +
                 "in error message. This legacy flag should not be documented.\n";
         }
-        if (!result.isEmpty()) { System.out.println(result); }
+
+        if (!result.isEmpty())
+            System.out.println(result);
+
         return result;
     }
 
@@ -343,12 +362,11 @@
         if (!isEnglishLocale()) { return; }
 
         for (File f : new File(JAVA_BIN).listFiles()) {
-            if (!f.canExecute()) {
-                continue;
-            }
-
             String toolName = f.getName();
 
+            if (notATool(toolName)) {
+                continue;
+            }
             if (dontTestTool(toolName)) {
                 System.out.println("Skipping test of tool " + toolName +
                                    ". Tool has no help message.");
@@ -363,7 +381,7 @@
             }
 
             // Test for help flags to be supported.
-            if (tool.supportsQestionmark == true) {
+            if (tool.supportsQuestionMark == true) {
                 errorMessage += testTool(f, "-?", tool.exitcodeOfHelp);
             } else {
                 System.out.println("Skip " + tool.toolname + ". It does not support -?.");