--- old/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java	2016-07-14 10:49:55.335726886 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java	2016-07-14 10:49:55.195725496 +0300
@@ -45,9 +45,10 @@
  * @bug 6637655 6985776
  * @summary Overlapping test for javax.swing.JScrollPane
  * @author sergey.grinev@oracle.com: area=awt.mixing
- * @library ../../regtesthelpers
+ * @library /java/awt/patchlib  ../../regtesthelpers
  * @modules java.desktop/sun.awt
  *          java.desktop/java.awt.peer
+ * @build java.desktop/java.awt.Helper
  * @build Util
  * @run main JGlassPaneInternalFrameOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java	2016-07-14 10:49:55.671730223 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java	2016-07-14 10:49:55.539728914 +0300
@@ -46,9 +46,10 @@
  * @bug 6637655 6981919
  * @summary Overlapping test for javax.swing.JScrollPane
  * @author sergey.grinev@oracle.com: area=awt.mixing
- * @library ../../regtesthelpers
+ * @library /java/awt/patchlib  ../../regtesthelpers
  * @modules java.desktop/sun.awt
  *          java.desktop/java.awt.peer
+ * @build java.desktop/java.awt.Helper
  * @build Util
  * @run main JGlassPaneMoveOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java	2016-07-14 10:49:56.019733681 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java	2016-07-14 10:49:55.883732331 +0300
@@ -42,9 +42,10 @@
  * @bug 6985399
  * @summary Overlapping test for javax.swing.JScrollPane
  * @author sergey.grinev@oracle.com: area=awt.mixing
- * @library ../../regtesthelpers
+ * @library /java/awt/patchlib  ../../regtesthelpers
  * @modules java.desktop/sun.awt
  *          java.desktop/java.awt.peer
+ * @build java.desktop/java.awt.Helper
  * @build Util
  * @run main JInternalFrameMoveOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java	2016-07-14 10:49:56.351736979 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java	2016-07-14 10:49:56.219735666 +0300
@@ -41,9 +41,10 @@
  * @key headful
  * @summary Overlapping test for javax.swing.JScrollPane
  * @author sergey.grinev@oracle.com: area=awt.mixing
- * @library ../../regtesthelpers
+ * @library /java/awt/patchlib  ../../regtesthelpers
  * @modules java.desktop/sun.awt
  *          java.desktop/java.awt.peer
+ * @build java.desktop/java.awt.Helper
  * @build Util
  * @run main JInternalFrameOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java	2016-07-14 10:49:56.687740315 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java	2016-07-14 10:49:56.555739005 +0300
@@ -43,9 +43,10 @@
  * @key headful
  * @summary Overlapping test for javax.swing.JScrollPane
  * @author sergey.grinev@oracle.com: area=awt.mixing
- * @library ../../regtesthelpers
+ * @library /java/awt/patchlib  ../../regtesthelpers
  * @modules java.desktop/sun.awt
  *          java.desktop/java.awt.peer
+ * @build java.desktop/java.awt.Helper
  * @build Util
  * @run main JScrollPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java	2016-07-14 10:49:57.027743693 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java	2016-07-14 10:49:56.891742340 +0300
@@ -50,9 +50,10 @@
  * @bug 6986109
  * @summary Overlapping test for javax.swing.JSplitPane
  * @author sergey.grinev@oracle.com: area=awt.mixing
- * @library ../../regtesthelpers
+ * @library /java/awt/patchlib  ../../regtesthelpers
  * @modules java.desktop/sun.awt
  *          java.desktop/java.awt.peer
+ * @build java.desktop/java.awt.Helper
  * @build Util
  * @run main JSplitPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java	2016-07-14 10:49:57.363747029 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java	2016-07-14 10:49:57.231745717 +0300
@@ -46,10 +46,11 @@
  * @key headful
  * @bug 6776743
  * @summary Opaque overlapping test for each AWT component
- * @library ../../regtesthelpers
+ * @library /java/awt/patchlib  ../../regtesthelpers
  * @modules java.desktop/com.sun.awt
  *          java.desktop/java.awt.peer
  *          java.desktop/sun.awt
+ * @build java.desktop/java.awt.Helper
  * @build Util
  * @run main OpaqueOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java	2016-07-14 10:49:57.699750364 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java	2016-07-14 10:49:57.567749054 +0300
@@ -32,10 +32,11 @@
  * @key headful
  * @bug 6994264
  * @summary Opaque overlapping test for Choice AWT component
- * @library ../../regtesthelpers
+ * @library /java/awt/patchlib  ../../regtesthelpers
  * @modules java.desktop/com.sun.awt
  *          java.desktop/java.awt.peer
  *          java.desktop/sun.awt
+ * @build java.desktop/java.awt.Helper
  * @build Util
  * @run main OpaqueOverlappingChoice
  */