--- a/langtools/test/tools/javac/modules/UsesTest.java	Fri Jun 17 17:09:21 2016 -0600
+++ b/langtools/test/tools/javac/modules/UsesTest.java	Fri Jun 17 17:40:01 2016 -0700
@@ -163,6 +163,7 @@
 
     @Test
     public void testMultiOnModulePath(Path base) throws Exception {
+        Path modSrc = base.resolve("modSrc");
         Path modules = base.resolve("modules");
         new ModuleBuilder(tb, "m1")
                 .exports("p")
@@ -171,18 +172,19 @@
         new ModuleBuilder(tb, "m2")
                 .requires("m1")
                 .uses("p.C")
-                .write(modules);
+                .write(modSrc);
 
         new JavacTask(tb)
                 .options("-mp", modules.toString())
                 .outdir(modules)
-                .files(findJavaFiles(modules.resolve("m2")))
+                .files(findJavaFiles(modSrc.resolve("m2")))
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
     }
 
     @Test
     public void testMultiOnModulePathInner(Path base) throws Exception {
+        Path modSrc = base.resolve("modSrc");
         Path modules = base.resolve("modules");
         new ModuleBuilder(tb, "m1")
                 .exports("p")
@@ -191,12 +193,12 @@
         new ModuleBuilder(tb, "m2")
                 .requires("m1")
                 .uses("p.C.Inner")
-                .write(modules);
+                .write(modSrc);
 
         new JavacTask(tb)
                 .options("-mp", modules.toString())
                 .outdir(modules)
-                .files(findJavaFiles(modules.resolve("m2")))
+                .files(findJavaFiles(modSrc.resolve("m2")))
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
     }