--- old/test/jdk/java/awt/Dialog/NestedDialogs/Modal/NestedModalDialogTest.java	2018-01-12 12:39:08.000000000 +0800
+++ new/test/jdk/java/awt/Dialog/NestedDialogs/Modal/NestedModalDialogTest.java	2018-01-12 12:39:07.000000000 +0800
@@ -22,7 +22,8 @@
  */
 
 /**
- * @test 8155740
+ * @test
+ * @bug 8155740
  * @key headful
  * @summary See <rdar://problem/3429130>: Events: actionPerformed() method not
  *          called when it is button is clicked (system load related)
--- old/test/jdk/java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java	2018-01-12 12:39:09.000000000 +0800
+++ new/test/jdk/java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java	2018-01-12 12:39:09.000000000 +0800
@@ -22,7 +22,8 @@
  */
 
 /**
- * @test 8155740
+ * @test
+ * @bug 8155740
  * @key headful
  * @summary See <rdar://problem/3429130>: Events: actionPerformed() method not
  *              called when it is button is clicked (system load related)
--- old/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java	2018-01-12 12:39:11.000000000 +0800
+++ new/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java	2018-01-12 12:39:11.000000000 +0800
@@ -36,7 +36,8 @@
 import static jdk.testlibrary.Asserts.assertTrue;
 
 /*
- * @test 8155742
+ * @test
+ * @bug 8155742
  * @key headful
  * @summary Make sure that modifier key mask is set when robot press
  *          some key with one or more modifiers.
--- old/test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java	2018-01-12 12:39:12.000000000 +0800
+++ new/test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java	2018-01-12 12:39:12.000000000 +0800
@@ -29,7 +29,8 @@
 import java.awt.image.BufferedImage;
 
 /*
- * @test 6384991
+ * @test
+ * @bug 6384991
  * @summary Check if ActionEvent is triggered by a TrayIcon when
  *          it is double clicked with mouse button 1 on windows
  *          or single clicked with button 3 on Mac OS X
--- old/test/jdk/java/lang/StackWalker/SecurityExceptions.java	2018-01-12 12:39:14.000000000 +0800
+++ new/test/jdk/java/lang/StackWalker/SecurityExceptions.java	2018-01-12 12:39:13.000000000 +0800
@@ -22,7 +22,8 @@
  */
 
 /*
- * @test 8020968
+ * @test
+ * @bug 8020968
  * @summary Test security permission check
  * @run main/othervm/java.security.policy=noperms.policy SecurityExceptions true
  * @run main/othervm/java.security.policy=stackwalk.policy SecurityExceptions false
--- old/test/jdk/java/lang/System/LoggerFinder/internal/SystemLoggerInPlatformLoader/SystemLoggerInPlatformLoader.java	2018-01-12 12:39:16.000000000 +0800
+++ new/test/jdk/java/lang/System/LoggerFinder/internal/SystemLoggerInPlatformLoader/SystemLoggerInPlatformLoader.java	2018-01-12 12:39:15.000000000 +0800
@@ -31,7 +31,8 @@
 import java.lang.reflect.Method;
 
 /*
- * @test 8163162
+ * @test
+ * @bug 8163162
  * @summary Checks that LazyLoggers are returned for System.Logger instances
  *          created by modules in the platform class loader.
  * @modules java.base/java.lang:open
--- old/test/jdk/java/security/cert/PKIXBuilderParameters/InvalidParameters.java	2018-01-12 12:39:17.000000000 +0800
+++ new/test/jdk/java/security/cert/PKIXBuilderParameters/InvalidParameters.java	2018-01-12 12:39:17.000000000 +0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @test 4422738
+ * @bug 4422738
  * @compile InvalidParameters.java
  * @run main InvalidParameters
  * @summary Make sure PKIXBuilderParameters(Set) detects invalid
--- old/test/jdk/java/security/cert/PKIXParameters/InvalidParameters.java	2018-01-12 12:39:19.000000000 +0800
+++ new/test/jdk/java/security/cert/PKIXParameters/InvalidParameters.java	2018-01-12 12:39:18.000000000 +0800
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @test 4422738
+ * @bug 4422738
  * @compile InvalidParameters.java
  * @run main InvalidParameters
  * @summary Make sure PKIXParameters(Set) and setTrustAnchors() detects invalid
--- old/test/jdk/java/util/Arrays/StreamAndSpliterator.java	2018-01-12 12:39:21.000000000 +0800
+++ new/test/jdk/java/util/Arrays/StreamAndSpliterator.java	2018-01-12 12:39:20.000000000 +0800
@@ -22,7 +22,8 @@
  */
 
 /**
- * @test 8037857
+ * @test
+ * @bug 8037857
  * @summary tests for stream and spliterator factory methods
  * @run testng StreamAndSpliterator
  */
--- old/test/jdk/java/util/Arrays/largeMemory/ParallelPrefix.java	2018-01-12 12:39:22.000000000 +0800
+++ new/test/jdk/java/util/Arrays/largeMemory/ParallelPrefix.java	2018-01-12 12:39:22.000000000 +0800
@@ -22,7 +22,8 @@
  */
 
 /**
- * @test 8014076 8025067
+ * @test
+ * @bug 8014076 8025067
  * @summary unit test for Arrays.ParallelPrefix().
  * @author Tristan Yan
  * @modules java.management jdk.management
--- old/test/jdk/java/util/Base64/TestBase64.java	2018-01-12 12:39:24.000000000 +0800
+++ new/test/jdk/java/util/Base64/TestBase64.java	2018-01-12 12:39:23.000000000 +0800
@@ -22,8 +22,9 @@
  */
 
 /**
- * @test 4235519 8004212 8005394 8007298 8006295 8006315 8006530 8007379 8008925
- *       8014217 8025003 8026330 8028397 8129544 8165243
+ * @test
+ * @bug 4235519 8004212 8005394 8007298 8006295 8006315 8006530 8007379 8008925
+ *      8014217 8025003 8026330 8028397 8129544 8165243
  * @summary tests java.util.Base64
  * @library /test/lib
  * @build jdk.test.lib.RandomFactory
--- old/test/jdk/java/util/Base64/TestBase64Golden.java	2018-01-12 12:39:25.000000000 +0800
+++ new/test/jdk/java/util/Base64/TestBase64Golden.java	2018-01-12 12:39:25.000000000 +0800
@@ -22,7 +22,8 @@
  */
 
 /*
- * @test 4235519
+ * @test
+ * @bug 4235519
  * @author Eric Wang <yiming.wang@oracle.com>
  * @summary tests java.util.Base64
  */
--- old/test/jdk/java/util/logging/LogManager/LinkageErrorTest.java	2018-01-12 12:39:27.000000000 +0800
+++ new/test/jdk/java/util/logging/LogManager/LinkageErrorTest.java	2018-01-12 12:39:26.000000000 +0800
@@ -28,7 +28,8 @@
 import java.util.logging.Logger;
 
 /**
- * @test 8152515
+ * @test
+ * @bug 8152515
  * @summary Checks that LinkageError are ignored when closing handlers
  *          during Shutdown.
  * @build LinkageErrorTest