--- old/test/runtime/NMT/MallocSiteHashOverflow.java	2014-08-21 08:14:27.275199905 -0700
+++ new/test/runtime/NMT/MallocSiteHashOverflow.java	2014-08-21 08:14:25.997138087 -0700
@@ -22,10 +22,9 @@
  */
 
 /*
- * @key stress
  * @test
  * @summary Test corner case that overflows malloc site hashtable bucket
- * @key nmt jcmd
+ * @key nmt jcmd stress
  * @library /testlibrary /testlibrary/whitebox
  * @ignore - This test is disabled since it will stress NMT and timeout during normal testing
  * @build MallocSiteHashOverflow
--- old/test/runtime/NMT/MallocStressTest.java	2014-08-21 08:14:31.762416944 -0700
+++ new/test/runtime/NMT/MallocStressTest.java	2014-08-21 08:14:30.556358609 -0700
@@ -22,10 +22,9 @@
  */
 
 /*
- * @key stress
  * @test
  * @summary Stress test for malloc tracking
- * @key nmt jcmd
+ * @key nmt jcmd stress
  * @library /testlibrary /testlibrary/whitebox
  * @build MallocStressTest
  * @ignore - This test is disabled since it will stress NMT and timeout during normal testing