@@ -25,11 +25,8 @@ const url = require('url');
   const forbiddenHostnameChars = [
     '\\\\exa mple\\share\\file.txt',
     '\\\\host name\\share\\file.txt',   // space
-    '\\\\host#name\\share\\file.txt',   // hash
-    '\\\\host?name\\share\\file.txt',   // question mark
     '\\\\host@name\\share\\file.txt',   // at sign
     '\\\\host:name\\share\\file.txt',   // colon
-    '\\\\host/name\\share\\file.txt',   // forward slash
     '\\\\host[name\\share\\file.txt',   // left bracket
     '\\\\host]name\\share\\file.txt',   // right bracket
   ];
@@ -42,6 +39,48 @@ const url = require('url');
   }
 }
 
+{
+  const hostnameStateTerminatorTestCases = [
+    {
+      path: '\\\\host#name\\share\\file.txt',
+      expected: 'file://host/share/file.txt',
+    },
+    {
+      path: '\\\\host?name\\share\\file.txt',
+      expected: 'file://host/share/file.txt',
+    },
+    {
+      path: '\\\\host/name\\share\\file.txt',
+      expected: 'file://host/share/file.txt',
+    },
+  ];
+  for (const { path, expected } of hostnameStateTerminatorTestCases) {
+    const actual = url.pathToFileURL(path, { windows: true }).href;
+    assert.strictEqual(actual, expected);
+  }
+}
+
+{
+  const ignoredHostnameCodePointTestCases = [
+    {
+      path: '\\\\host\nname\\share\\file.txt',
+      expected: 'file://hostname/share/file.txt',
+    },
+    {
+      path: '\\\\host\rname\\share\\file.txt',
+      expected: 'file://hostname/share/file.txt',
+    },
+    {
+      path: '\\\\host\tname\\share\\file.txt',
+      expected: 'file://hostname/share/file.txt',
+    },
+  ];
+  for (const { path, expected } of ignoredHostnameCodePointTestCases) {
+    const actual = url.pathToFileURL(path, { windows: true }).href;
+    assert.strictEqual(actual, expected);
+  }
+}
+
 {
   if (isWindows) {
     // UNC path: \\server\share\resource