--- old/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java	2016-03-24 17:03:06.931261783 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java	2016-03-24 17:03:06.839261039 +0300
@@ -50,9 +50,10 @@
 @bug 6778882
 @summary Viewport overlapping test for each AWT component
 @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 ViewportOverlapping
  */
--- old/test/java/awt/MouseInfo/PointerInfoCrashTest.java	2016-03-24 17:03:07.231264207 +0300
+++ new/test/java/awt/MouseInfo/PointerInfoCrashTest.java	2016-03-24 17:03:07.135263431 +0300
@@ -32,7 +32,7 @@
  * @test
  * @bug 8143316
  * @modules java.desktop/java.awt.peer
- *          java.desktop/sun.awt.peer
+ *          java.desktop/sun.awt
  * @summary Crash Trend in 1.9.0-ea-b93 (sun.awt.DefaultMouseInfoPeer.fillPointWithCoords)
  */
 public class PointerInfoCrashTest {
--- old/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh	2016-03-24 17:03:07.511266468 +0300
+++ new/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh	2016-03-24 17:03:07.415265692 +0300
@@ -105,17 +105,6 @@
 fi
 echo "JDK under test is: $TESTJAVA"
 
-##Deal with .class files:
-#if [ -n "${STANDALONE}" ] ; then
-#   # then compile all .java files (if there are any) into .class files
-#   if [ -a *.java ]; then
-#      ${TESTJAVA}/bin/javac$ ./*.java ;
-#   fi
-#   # else in harness so copy all the class files from where jtreg put them
-#   # over to the scratch directory this test is running in. 
-#   else cp ${TESTCLASSES}/*.class . ;
-#fi
-#
 #if in test harness, then copy the entire directory that the test is in over 
 # to the scratch directory.  This catches any support files needed by the test.
 if [ -z "${STANDALONE}" ] ; 
--- old/test/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java	2016-03-24 17:03:07.799268795 +0300
+++ new/test/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java	2016-03-24 17:03:07.707268051 +0300
@@ -30,7 +30,7 @@
  * @bug 7153700
  * @summary Check for mouseMoved event for java.awt.TrayIcon
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library ../../../../lib/testlibrary ../
  * @build ExtendedRobot SystemTrayIconHelper
  * @run main MouseMovedTest
  */
--- old/test/java/awt/xembed/server/RunTestXEmbed.java	2016-03-24 17:03:08.087271121 +0300
+++ new/test/java/awt/xembed/server/RunTestXEmbed.java	2016-03-24 17:03:07.995270377 +0300
@@ -27,9 +27,10 @@
  * @summary Tests XEmbed server/client functionality
  * @author Denis Mikhalkin: area=awt.xembed
  * @requires (!(os.family=="mac") & !(os.family=="windows"))
- * @library /lib/testlibrary
- * @build jdk.testlibrary.Platform
+ * @library /java/awt/patchlib /lib/testlibrary
  * @modules java.desktop/sun.awt
+ * @build jdk.testlibrary.Platform
+ * @build java.desktop/java.awt.Helper
  * @compile JavaClient.java TesterClient.java TestXEmbedServer.java
  * @run main/timeout=6000 RunTestXEmbed
  */
@@ -39,6 +40,7 @@
 import java.util.logging.*;
 import java.util.*;
 import java.io.*;
+import jdk.testlibrary.Platform;
 
 public class RunTestXEmbed extends TestXEmbedServer {
     private static final Logger log = Logger.getLogger("test.xembed");
--- old/test/java/awt/xembed/server/TestXEmbedServerJava.java	2016-03-24 17:03:08.375273448 +0300
+++ new/test/java/awt/xembed/server/TestXEmbedServerJava.java	2016-03-24 17:03:08.279272672 +0300
@@ -26,7 +26,10 @@
  * @bug 4931668
  * @summary Tests XEmbed server/client functionality
  * @author denis mikhalkin: area=awt.xembed
+ * @requires (!(os.family=="mac") & !(os.family=="windows"))
  * @modules java.desktop/sun.awt
+ * @library /java/awt/patchlib
+ * @build java.desktop/java.awt.Helper
  * @compile JavaClient.java TesterClient.java TestXEmbedServer.java
  * @run main/manual TestXEmbedServerJava
  */
@@ -38,9 +41,6 @@
 
 public class TestXEmbedServerJava extends TestXEmbedServer {
     public static void main(String[] args) {
-        if (System.getProperty("os.name").toLowerCase().startsWith("win")) {
-            return;
-        }
 
         // Enabled XEmbed
         System.setProperty("sun.awt.xembedserver", "true");
--- old/test/java/awt/xembed/server/TesterClient.java	2016-03-24 17:03:08.663275774 +0300
+++ new/test/java/awt/xembed/server/TesterClient.java	2016-03-24 17:03:08.571275030 +0300
@@ -32,7 +32,7 @@
     public static void main(String[] args) throws Throwable {
         // First parameter is the name of the test, second is the window, the rest are rectangles
         Class cl = Class.forName("sun.awt.X11.XEmbedServerTester");
-        cl.getModule().addExports("sun.awt.X11",TesterClient.class.getModule());
+        java.awt.Helper.addExports("sun.awt.X11", TesterClient.class.getModule());
 
         test = cl.getMethod(args[0], new Class[0]);
         long window = Long.parseLong(args[1]);
--- old/test/javax/swing/Action/8133039/bug8133039.java	2016-03-24 17:03:08.959278165 +0300
+++ new/test/javax/swing/Action/8133039/bug8133039.java	2016-03-24 17:03:08.863277390 +0300
@@ -37,6 +37,7 @@
  * @test
  * @bug 8133039
  * @summary Provide public API to sun.swing.UIAction#isEnabled(Object)
+ * @modules java.desktop/sun.swing
  * @author Alexander Scherbatiy
  */
 public class bug8133039 {