diff --git a/jdk/test/javax/xml/jaxp/transform/jdk8004476/SecureProcessingTest.xml b/jdk/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml
similarity index 100%
rename from jdk/test/javax/xml/jaxp/transform/jdk8004476/SecureProcessingTest.xml
rename to jdk/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml
diff --git a/jdk/test/javax/xml/jaxp/transform/jdk8004476/TestBase.java b/jdk/test/javax/xml/jaxp/transform/8004476/TestBase.java
similarity index 100%
rename from jdk/test/javax/xml/jaxp/transform/jdk8004476/TestBase.java
rename to jdk/test/javax/xml/jaxp/transform/8004476/TestBase.java
diff --git a/jdk/test/javax/xml/jaxp/transform/jdk8004476/XPathExFuncTest.java b/jdk/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java
similarity index 100%
rename from jdk/test/javax/xml/jaxp/transform/jdk8004476/XPathExFuncTest.java
rename to jdk/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java
diff --git a/jdk/test/javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java b/jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java
similarity index 96%
rename from jdk/test/javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java
rename to jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java
index 3565ba75993..b86bcff4900 100644
--- a/jdk/test/javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java
+++ b/jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java
@@ -66,10 +66,10 @@ public class XSLTExFuncTest extends TestBase {
         xslFile = filepath + "/tokenize.xsl";
 
         /**
-         * if (isWindows) { xslFile = "/" + xslFile; }
-         *
+         * On Windows platform it needs triple '/' for valid URL while double '/' is enough on Linux or Solaris.
+         * Here use file:/// directly to make it work on Windows and it will not impact other platforms.
          */
-        xslFileId = "file://" + xslFile;
+        xslFileId = "file:///" + xslFile;
     }
 
     /**
diff --git a/jdk/test/javax/xml/jaxp/transform/jdk8004476/tokenize.xml b/jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xml
similarity index 100%
rename from jdk/test/javax/xml/jaxp/transform/jdk8004476/tokenize.xml
rename to jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xml
diff --git a/jdk/test/javax/xml/jaxp/transform/jdk8004476/tokenize.xsl b/jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xsl
similarity index 100%
rename from jdk/test/javax/xml/jaxp/transform/jdk8004476/tokenize.xsl
rename to jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xsl