--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java	Fri May 09 15:24:57 2014 +0200
@@ -26,6 +26,7 @@
  * @bug 8028994
  * @author Staffan Larsen
  * @library /lib/testlibrary
+ * @build jdk.testlibrary.*
  * @run main CheckOrigin
  */
 

--- a/jdk/test/com/sun/tools/attach/BasicTests.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/com/sun/tools/attach/BasicTests.java	Fri May 09 15:24:57 2014 +0200
@@ -38,7 +38,7 @@
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
  * @library /lib/testlibrary
- * @run build Agent BadAgent RedefineAgent Application Shutdown RedefineDummy RunnerUtil
+ * @run build jdk.testlibrary.* Agent BadAgent RedefineAgent Application Shutdown RedefineDummy RunnerUtil
  * @run main BasicTests
  *
  * This test will perform a number of basic attach tests.

--- a/jdk/test/com/sun/tools/attach/PermissionTest.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/com/sun/tools/attach/PermissionTest.java	Fri May 09 15:24:57 2014 +0200
@@ -34,7 +34,7 @@
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
  * @library /lib/testlibrary
- * @run build Application Shutdown
+ * @run build jdk.testlibrary.* Application Shutdown
  * @run main PermissionTest
  *
  * Unit test for Attach API -

--- a/jdk/test/com/sun/tools/attach/ProviderTest.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/com/sun/tools/attach/ProviderTest.java	Fri May 09 15:24:57 2014 +0200
@@ -33,7 +33,7 @@
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
  * @library /lib/testlibrary
- * @run build SimpleProvider
+ * @run build jdk.testlibrary.* SimpleProvider
  * @run main ProviderTest
  *
  * The test will attach and detach to/from the running Application.

--- a/jdk/test/java/io/BufferedInputStream/LargeCopyWithMark.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/java/io/BufferedInputStream/LargeCopyWithMark.java	Fri May 09 15:24:57 2014 +0200
@@ -26,6 +26,7 @@
  * @summary BufferedInputStream calculates negative array size with large
  *          streams and mark
  * @library /lib/testlibrary
+ * @build jdk.testlibrary.*
  * @run main/othervm LargeCopyWithMark
  */
 

--- a/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java	Fri May 09 15:24:57 2014 +0200
@@ -30,7 +30,7 @@
  * @bug 6289149
  * @summary test when the agent's class is missing the premain() function.
  * @library /lib/testlibrary
- * @run build DummyMain
+ * @run build jdk.testlibrary.* DummyMain
  * @run shell ../MakeJAR3.sh NoPremainAgent
  * @run main NoPremainAgentTest
  */

--- a/jdk/test/java/lang/instrument/PremainClass/PremainClassTest.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/java/lang/instrument/PremainClass/PremainClassTest.java	Fri May 09 15:24:57 2014 +0200
@@ -30,7 +30,7 @@
  * @bug 5055293
  * @summary Test non ascii characters in the Premain-Class attribute.
  * @library /lib/testlibrary
- * @run build DummyMain
+ * @run build jdk.testlibrary.* DummyMain
  * @run main PremainClassTest
  */
 public class PremainClassTest {

--- a/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java	Fri May 09 15:24:57 2014 +0200
@@ -30,7 +30,7 @@
  * @bug 6289149
  * @summary test when the agent's class has a zero arg premain() function.
  * @library /lib/testlibrary
- * @run build DummyMain
+ * @run build jdk.testlibrary.* DummyMain
  * @run shell ../MakeJAR3.sh ZeroArgPremainAgent
  * @run main ZeroArgPremainAgentTest
  */

--- a/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java	Fri May 09 15:24:57 2014 +0200
@@ -31,7 +31,7 @@
  * @author  Mandy Chung
  *
  * @library /lib/testlibrary/
- * @build CollectionUsageThreshold MemoryUtil RunUtil
+ * @build jdk.testlibrary.* CollectionUsageThreshold MemoryUtil RunUtil
  * @run main/timeout=300 CollectionUsageThreshold
  */
 

--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java	Fri May 09 15:24:57 2014 +0200
@@ -31,7 +31,7 @@
  * @author  Mandy Chung
  *
  * @library /lib/testlibrary/
- * @build LowMemoryTest MemoryUtil RunUtil
+ * @build jdk.testlibrary.* LowMemoryTest MemoryUtil RunUtil
  * @run main/timeout=600 LowMemoryTest
  */
 

--- a/jdk/test/java/net/URLPermission/nstest/lookup.sh	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/java/net/URLPermission/nstest/lookup.sh	Fri May 09 15:24:57 2014 +0200
@@ -26,7 +26,7 @@
 # @library /lib/testlibrary
 # @compile -XDignore.symbol.file=true SimpleNameService.java
 #            LookupTest.java SimpleNameServiceDescriptor.java
-# @build jdk.testlibrary.Utils
+# @build jdk.testlibrary.*
 # @run shell/timeout=50 lookup.sh
 #
 

--- a/jdk/test/javax/management/monitor/StartStopTest.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/javax/management/monitor/StartStopTest.java	Fri May 09 15:24:57 2014 +0200
@@ -28,7 +28,7 @@
  *          monitors are started and stopped in a loop.
  * @author Luis-Miguel Alventosa
  * @library /lib/testlibrary
- * @run build jdk.testlibrary.Utils
+ * @build jdk.testlibrary.*
  * @run clean StartStopTest
  * @run build StartStopTest
  * @run main/othervm/timeout=300 StartStopTest 1

--- a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Fri May 09 15:24:57 2014 +0200
@@ -41,7 +41,7 @@
  * @test
  * @bug 6434402 8004926
  * @library /lib/testlibrary
- * @build jdk.testlibrary.ProcessTools
+ * @build jdk.testlibrary.*
  * @build TestManager TestApplication CustomLauncherTest
  * @run main/othervm CustomLauncherTest
  * @author Jaroslav Bachorik

--- a/jdk/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java	Fri May 09 15:24:57 2014 +0200
@@ -28,6 +28,7 @@
  * @author  Robert Field
  * @library /lib/testlibrary
  * @compile -XDignore.symbol.file ManyNewInstanceAnonTest.java
+ * @build jdk.testlibrary.*
  * @run main ClassFileInstaller ManyNewInstanceAnonTest
  * @run main/othervm -Xbootclasspath/a:. -Xverify:all ManyNewInstanceAnonTest
  * @run main/othervm -Xbootclasspath/a:. -Xverify:all -Dsun.reflection.noInflation=true ManyNewInstanceAnonTest

--- a/jdk/test/sun/tools/jcmd/TestJcmdDefaults.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/sun/tools/jcmd/TestJcmdDefaults.java	Fri May 09 15:24:57 2014 +0200
@@ -39,6 +39,7 @@
  * @test
  * @bug 7104647
  * @library /lib/testlibrary
+ * @build jdk.testlibrary.*
  * @run main TestJcmdDefaults
  */
 public class TestJcmdDefaults {

--- a/jdk/test/sun/tools/jcmd/TestJcmdSanity.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/sun/tools/jcmd/TestJcmdSanity.java	Fri May 09 15:24:57 2014 +0200
@@ -40,6 +40,7 @@
  * @test
  * @bug 7104647 7154822
  * @library /lib/testlibrary
+ * @build jdk.testlibrary.*
  * @run main TestJcmdSanity
  */
 public class TestJcmdSanity {

--- a/jdk/test/sun/tools/jmap/BasicJMapTest.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/sun/tools/jmap/BasicJMapTest.java	Fri May 09 15:24:57 2014 +0200
@@ -34,6 +34,7 @@
  * @bug 6321286
  * @summary Unit test for jmap utility
  * @library /lib/testlibrary
+ * @build jdk.testlibrary.*
  * @run main BasicJMapTest
  */
 public class BasicJMapTest {

--- a/jdk/test/sun/tools/jstack/BasicJStackTest.java	Fri May 09 15:27:02 2014 -0400
+++ b/jdk/test/sun/tools/jstack/BasicJStackTest.java	Fri May 09 15:24:57 2014 +0200
@@ -32,6 +32,7 @@
  * @bug 6260070
  * @summary Unit test for jstack utility
  * @library /lib/testlibrary
+ * @build jdk.testlibrary.*
  * @run main BasicJStackTest
  */
 public class BasicJStackTest {