--- a/langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java	Tue Apr 15 15:55:24 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java	Wed Apr 16 16:17:09 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -55,17 +55,17 @@
     };
 
     private static final String[][] TEST3 = {
-        {BUG_ID + "-3" + FS + "class-use" + FS + "UsedInC.html", "Uses of <a href=" +
+        {BUG_ID + "-3/class-use/UsedInC.html", "Uses of <a href=" +
                  "\"../UsedInC.html\" title=\"class in &lt;Unnamed&gt;\">" +
                  "UsedInC</a> in <a href=\"../package-summary.html\">&lt;Unnamed&gt;</a>"
         },
-        {BUG_ID + "-3" + FS + "package-use.html", "<td class=\"colOne\">" +
+        {BUG_ID + "-3/package-use.html", "<td class=\"colOne\">" +
                  "<a href=\"class-use/UsedInC.html#%3CUnnamed%3E\">UsedInC</a>&nbsp;</td>"
         }
     };
 
     private static final String[][] TEST4 = {
-        {BUG_ID + "-4" + FS + "pkg2" + FS + "class-use" + FS + "C3.html", "<a href=" +
+        {BUG_ID + "-4/pkg2/class-use/C3.html", "<a href=" +
                  "\"../../index.html?pkg2/class-use/C3.html\" target=\"_top\">" +
                  "Frames</a></li>"
         }
@@ -80,7 +80,8 @@
     };
 
     private static final String[] ARGS3 = new String[] {
-        "-d", BUG_ID + "-3", "-sourcepath", SRC_DIR, "-use", SRC_DIR + FS + "C.java", SRC_DIR + FS + "UsedInC.java"
+        "-d", BUG_ID + "-3", "-sourcepath", SRC_DIR, "-use", SRC_DIR +
+        "/C.java", SRC_DIR + "/UsedInC.java"
     };
 
     private static final String[] ARGS4 = new String[] {
@@ -95,19 +96,20 @@
         String[][] tests = new String[11][2];
         //Eight tests for class use.
         for (int i = 0; i < 8; i++) {
-            tests[i][0] = BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html";
+            tests[i][0] = BUG_ID + "/pkg1/class-use/C1.html";
             tests[i][1] = "Test " + (i + 1) + " passes";
         }
         //Three more tests for package use.
         for (int i = 8, j = 1; i < tests.length; i++, j++) {
-            tests[i][0] = BUG_ID + FS + "pkg1" + FS + "package-use.html";
+            tests[i][0] = BUG_ID + "/pkg1/package-use.html";
             tests[i][1] = "Test " + j + " passes";
         }
         TestUseOption tester = new TestUseOption();
         run(tester, ARGS, tests, NO_TEST);
         tester.printSummary();
         run(tester, ARGS2, NO_TEST, NO_TEST);
-        String usePageContents = tester.readFileToString(BUG_ID +"-2" + FS + "pkg1" + FS + "class-use" + FS + "UsedClass.html");
+        String usePageContents = tester.readFileToString(BUG_ID +
+            "-2/pkg1/class-use/UsedClass.html");
         int prevIndex = -1;
         int currentIndex = -1;
         for (int i = 0; i < TEST2.length; i++) {