--- old/test/java/io/FilePermission/ReadFileOnPath.java	2017-03-22 14:46:27.000000000 +0800
+++ new/test/java/io/FilePermission/ReadFileOnPath.java	2017-03-22 14:46:26.000000000 +0800
@@ -26,7 +26,7 @@
  * @bug 8164705
  * @library /lib/testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
- *          java.compiler
+ *          jdk.compiler
  * @run main ReadFileOnPath
  * @summary Still able to read file on the same path
  */
--- old/test/java/lang/Package/annotation/PackageInfoTest.java	2017-03-22 14:46:28.000000000 +0800
+++ new/test/java/lang/Package/annotation/PackageInfoTest.java	2017-03-22 14:46:28.000000000 +0800
@@ -25,8 +25,7 @@
  * @test
  * @summary Basic test of package-info in named module and duplicate
  *          package-info in unnamed module
- * @modules java.compiler
- *          java.desktop
+ * @modules java.desktop
  *          jdk.compiler
  *          jdk.xml.dom
  * @build jdk.xml.dom/org.w3c.dom.css.Fake
--- old/test/java/lang/reflect/PublicMethods/PublicMethodsTest.java	2017-03-22 14:46:29.000000000 +0800
+++ new/test/java/lang/reflect/PublicMethods/PublicMethodsTest.java	2017-03-22 14:46:29.000000000 +0800
@@ -57,8 +57,7 @@
 /*
  * @test
  * @bug 8062389
- * @modules java.compiler
- *          jdk.compiler
+ * @modules jdk.compiler
  *          jdk.zipfs
  * @summary Nearly exhaustive test of Class.getMethod() and Class.getMethods()
  * @run main PublicMethodsTest
--- old/test/java/net/spi/URLStreamHandlerProvider/Basic.java	2017-03-22 14:46:30.000000000 +0800
+++ new/test/java/net/spi/URLStreamHandlerProvider/Basic.java	2017-03-22 14:46:30.000000000 +0800
@@ -53,8 +53,7 @@
 /*
  * @test
  * @bug 8064924
- * @modules java.compiler
- *          jdk.compiler
+ * @modules jdk.compiler
  * @summary Basic test for URLStreamHandlerProvider
  * @library /lib/testlibrary
  * @build jdk.testlibrary.FileUtils jdk.testlibrary.JDKToolFinder
--- old/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java	2017-03-22 14:46:31.000000000 +0800
+++ new/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java	2017-03-22 14:46:31.000000000 +0800
@@ -26,8 +26,7 @@
  * @bug 8132734 8144062 8159785
  * @summary Test that URL connections to multi-release jars can be runtime versioned
  * @library /lib/testlibrary/java/util/jar
- * @modules java.compiler
- *          jdk.compiler
+ * @modules jdk.compiler
  *          jdk.httpserver
  *          jdk.jartool
  * @build Compiler JarBuilder CreateMultiReleaseTestJars SimpleHttpServer