--- old/test/serviceability/dcmd/gc/ClassHistogramAllTest.java	2016-08-11 13:45:13.666436300 -0400
+++ new/test/serviceability/dcmd/gc/ClassHistogramAllTest.java	2016-08-11 13:45:13.262917800 -0400
@@ -24,14 +24,11 @@
 /*
  * @test
  * @summary Test of diagnostic command GC.class_histogram -all=true
- * @library /testlibrary
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
- * @build ClassHistogramTest
  * @run testng ClassHistogramAllTest
  */
 public class ClassHistogramAllTest extends ClassHistogramTest {