--- old/test/tools/javac/modules/ResolveTest.java	2016-12-15 09:20:21.071789892 +0000
+++ new/test/tools/javac/modules/ResolveTest.java	2016-12-15 09:20:20.964782572 +0000
@@ -36,7 +36,6 @@
 
 import toolbox.JavacTask;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class ResolveTest extends ModuleTestBase {
     public static void main(String... args) throws Exception {
@@ -83,11 +82,11 @@
     @Test
     public void testUnexportedTypeUnreadableModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { }",
                 "package p2; public class C2 { p1.C1 c; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
@@ -107,11 +106,11 @@
     @Test
     public void testUnexportedTypeReadableModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; }",
                 "package p2; public class C2 { p1.C1 c; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
@@ -131,14 +130,14 @@
     @Test
     public void testQualifiedExportedTypeReadableModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { exports p1 to m3; }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { exports p1 to m3x; }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; }",
                 "package p2; public class C2 { p1.C1 c; }");
-        tb.writeJavaFiles(src.resolve("m3"),
-                "module m3 { requires m1; }");
+        tb.writeJavaFiles(src.resolve("m3x"),
+                "module m3x { requires m1x; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
 
@@ -157,11 +156,11 @@
     @Test
     public void testExportedTypeUnreadableModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { exports p1; }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { exports p1; }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { }",
                 "package p2; public class C2 { p1.C1 c; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
@@ -181,11 +180,11 @@
     @Test
     public void testExportedTypeReadableModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { exports p1; }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { exports p1; }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; }",
                 "package p2; public class C2 { p1.C1 c; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
@@ -201,11 +200,11 @@
     @Test
     public void testExportedTypeReadableModule2(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { exports p1 to m2; }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { exports p1 to m2x; }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; }",
                 "package p2; public class C2 { p1.C1 c; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);