--- old/test/java/awt/EventQueue/6980209/bug6980209.java	2015-07-02 13:39:43.000000000 +0300
+++ new/test/java/awt/EventQueue/6980209/bug6980209.java	2015-07-02 13:39:43.000000000 +0300
@@ -25,6 +25,7 @@
    @bug 6980209
    @summary Make tracking SecondaryLoop.enter/exit methods easier
    @author Semyon Sadetsky
+   @modules java.base/sun.util.logging
   */
 
 import sun.util.logging.PlatformLogger;
--- old/test/java/awt/FileDialog/8017487/bug8017487.java	2015-07-02 13:39:43.000000000 +0300
+++ new/test/java/awt/FileDialog/8017487/bug8017487.java	2015-07-02 13:39:43.000000000 +0300
@@ -25,6 +25,7 @@
    @bug 8017487
    @summary filechooser in Windows-Libraries folder: columns are mixed up
    @author Semyon Sadetsky
+   @modules java.desktop/sun.awt.shell
    @library /lib/testlibrary
    @build jdk.testlibrary.OSInfo
    @run main bug8017487
--- old/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java	2015-07-02 13:39:44.000000000 +0300
+++ new/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java	2015-07-02 13:39:44.000000000 +0300
@@ -28,13 +28,11 @@
  * @compile AWTFocusTransitionTest.java
  * @run main/othervm AWTFocusTransitionTest
  */
-import sun.awt.SunToolkit;
 
 import java.awt.*;
 import java.awt.event.KeyEvent;
 
 public class AWTFocusTransitionTest {
-    private static SunToolkit toolkit;
     private static Robot robot;
 
     private static Frame frame;
@@ -42,20 +40,19 @@
     private static Button button;
 
     public static void main(String[] args) throws Exception {
-        toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
         robot = new Robot();
         robot.setAutoDelay(50);
 
         try {
             createAndShowGUI();
 
-            toolkit.realSync();
+            robot.waitForIdle();
 
             checkFocusOwner(textField);
 
             robot.keyPress(KeyEvent.VK_TAB);
             robot.keyRelease(KeyEvent.VK_TAB);
-            toolkit.realSync();
+            robot.waitForIdle();
 
             checkFocusOwner(button);
 
@@ -63,7 +60,7 @@
             robot.keyPress(KeyEvent.VK_TAB);
             robot.keyRelease(KeyEvent.VK_TAB);
             robot.keyRelease(KeyEvent.VK_SHIFT);
-            toolkit.realSync();
+            robot.waitForIdle();
 
             checkFocusOwner(textField);
 
@@ -71,7 +68,7 @@
             robot.keyPress(KeyEvent.VK_TAB);
             robot.keyRelease(KeyEvent.VK_TAB);
             robot.keyRelease(KeyEvent.VK_SHIFT);
-            toolkit.realSync();
+            robot.waitForIdle();
 
             checkFocusOwner(button);
         } finally {
--- old/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java	2015-07-02 13:39:44.000000000 +0300
+++ new/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java	2015-07-02 13:39:44.000000000 +0300
@@ -28,14 +28,12 @@
  * @compile SwingFocusTransitionTest.java
  * @run main/othervm SwingFocusTransitionTest
  */
-import sun.awt.SunToolkit;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.KeyEvent;
 
 public class SwingFocusTransitionTest {
-    private static SunToolkit toolkit;
     private static Robot robot;
 
     private static JFrame frame;
@@ -43,7 +41,6 @@
     private static JButton button;
 
     public static void main(String[] args) throws Exception {
-        toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
         robot = new Robot();
         robot.setAutoDelay(50);
 
@@ -55,13 +52,13 @@
                 }
             });
 
-            toolkit.realSync();
+            robot.waitForIdle();
 
             checkFocusOwner(textField);
 
             robot.keyPress(KeyEvent.VK_TAB);
             robot.keyRelease(KeyEvent.VK_TAB);
-            toolkit.realSync();
+            robot.waitForIdle();
 
             checkFocusOwner(button);
 
@@ -69,7 +66,7 @@
             robot.keyPress(KeyEvent.VK_TAB);
             robot.keyRelease(KeyEvent.VK_TAB);
             robot.keyRelease(KeyEvent.VK_SHIFT);
-            toolkit.realSync();
+            robot.waitForIdle();
 
             checkFocusOwner(textField);
 
@@ -77,7 +74,7 @@
             robot.keyPress(KeyEvent.VK_TAB);
             robot.keyRelease(KeyEvent.VK_TAB);
             robot.keyRelease(KeyEvent.VK_SHIFT);
-            toolkit.realSync();
+            robot.waitForIdle();
 
             checkFocusOwner(button);
         } finally {
--- old/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java	2015-07-02 13:39:45.000000000 +0300
+++ new/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java	2015-07-02 13:39:44.000000000 +0300
@@ -26,6 +26,8 @@
   @bug       6516675
   @summary   Tests that EmbeddedFrame can be focused.
   @author    anton.tarasov: area=awt-focus
+  @modules   java.desktop/java.awt.peer
+             java.desktop/sun.awt
   @library   ../../regtesthelpers
   @build     Util UtilInternal
   @run       main FocusEmbeddedFrameTest
--- old/test/java/awt/JAWT/JAWT.sh	2015-07-02 13:39:45.000000000 +0300
+++ new/test/java/awt/JAWT/JAWT.sh	2015-07-02 13:39:45.000000000 +0300
@@ -129,7 +129,7 @@
 esac
 
 echo "OS-ARCH is" ${SYST}-${ARCH}
-${TESTJAVA}${FS}jre${FS}bin${FS}java -fullversion 2>&1
+${TESTJAVA}${FS}bin${FS}java -fullversion 2>&1
 
 which ${MAKE} >${NULL} 2>&1
 if [ "$?" -ne '0' ]
@@ -156,7 +156,7 @@
 
 cp ${TESTSRC}${FS}${MAKEFILE} .
 
-JAVA=${TESTJAVA}${FS}jre${FS}bin${FS}java
+JAVA=${TESTJAVA}${FS}bin${FS}java
 JAVAC=${TESTJAVA}${FS}bin${FS}javac
 JAVAH=${TESTJAVA}${FS}bin${FS}javah
 
--- old/test/java/awt/JAWT/Makefile.unix	2015-07-02 13:39:45.000000000 +0300
+++ new/test/java/awt/JAWT/Makefile.unix	2015-07-02 13:39:45.000000000 +0300
@@ -32,7 +32,7 @@
 
 J_INC =		$(TESTJAVA)/include
 INCLUDES =	-I$(J_INC) -I$(J_INC)/$(SYST) -I.
-LIBS =		-L$(TESTJAVA)/jre/lib/$(ARCH) -ljawt -lX11
+LIBS =		-L$(TESTJAVA)/lib/$(ARCH) -ljawt -lX11
 
 all:		$(CLASSES) libmylib.so
 
--- old/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java	2015-07-02 13:39:46.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java	2015-07-02 13:39:46.000000000 +0300
@@ -34,6 +34,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JButtonInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java	2015-07-02 13:39:46.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java	2015-07-02 13:39:46.000000000 +0300
@@ -34,6 +34,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JButtonOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java	2015-07-02 13:39:47.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java	2015-07-02 13:39:46.000000000 +0300
@@ -33,6 +33,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JColorChooserOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java	2015-07-02 13:39:47.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java	2015-07-02 13:39:47.000000000 +0300
@@ -44,6 +44,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JComboBoxOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java	2015-07-02 13:39:47.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java	2015-07-02 13:39:47.000000000 +0300
@@ -35,6 +35,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JEditorPaneInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java	2015-07-02 13:39:48.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java	2015-07-02 13:39:48.000000000 +0300
@@ -33,6 +33,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JEditorPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java	2015-07-02 13:39:48.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java	2015-07-02 13:39:48.000000000 +0300
@@ -46,6 +46,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JGlassPaneInternalFrameOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java	2015-07-02 13:39:49.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java	2015-07-02 13:39:49.000000000 +0300
@@ -47,6 +47,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JGlassPaneMoveOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java	2015-07-02 13:39:49.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java	2015-07-02 13:39:49.000000000 +0300
@@ -43,6 +43,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JInternalFrameMoveOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java	2015-07-02 13:39:50.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java	2015-07-02 13:39:49.000000000 +0300
@@ -42,6 +42,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JInternalFrameOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java	2015-07-02 13:39:50.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java	2015-07-02 13:39:50.000000000 +0300
@@ -35,6 +35,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JLabelInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java	2015-07-02 13:39:50.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java	2015-07-02 13:39:50.000000000 +0300
@@ -34,6 +34,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JLabelOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java	2015-07-02 13:39:51.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java	2015-07-02 13:39:51.000000000 +0300
@@ -34,6 +34,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JListInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java	2015-07-02 13:39:51.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java	2015-07-02 13:39:51.000000000 +0300
@@ -33,6 +33,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JListOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java	2015-07-02 13:39:52.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java	2015-07-02 13:39:51.000000000 +0300
@@ -49,6 +49,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JMenuBarOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java	2015-07-02 13:39:52.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java	2015-07-02 13:39:52.000000000 +0300
@@ -35,6 +35,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JPanelInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java	2015-07-02 13:39:52.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java	2015-07-02 13:39:52.000000000 +0300
@@ -34,6 +34,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JPanelOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java	2015-07-02 13:39:53.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java	2015-07-02 13:39:53.000000000 +0300
@@ -46,6 +46,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JPopupMenuOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java	2015-07-02 13:39:53.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java	2015-07-02 13:39:53.000000000 +0300
@@ -35,6 +35,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JProgressBarInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java	2015-07-02 13:39:54.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java	2015-07-02 13:39:53.000000000 +0300
@@ -34,6 +34,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JProgressBarOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java	2015-07-02 13:39:54.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java	2015-07-02 13:39:54.000000000 +0300
@@ -38,6 +38,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JScrollBarInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java	2015-07-02 13:39:54.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java	2015-07-02 13:39:54.000000000 +0300
@@ -37,6 +37,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JScrollBarOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java	2015-07-02 13:39:55.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java	2015-07-02 13:39:55.000000000 +0300
@@ -44,6 +44,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JScrollPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java	2015-07-02 13:39:55.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java	2015-07-02 13:39:55.000000000 +0300
@@ -35,6 +35,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JSliderInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java	2015-07-02 13:39:56.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java	2015-07-02 13:39:55.000000000 +0300
@@ -34,6 +34,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JSliderOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java	2015-07-02 13:39:56.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java	2015-07-02 13:39:56.000000000 +0300
@@ -37,6 +37,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JSpinnerInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java	2015-07-02 13:39:56.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java	2015-07-02 13:39:56.000000000 +0300
@@ -36,6 +36,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JSpinnerOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java	2015-07-02 13:39:57.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java	2015-07-02 13:39:57.000000000 +0300
@@ -50,6 +50,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JSplitPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java	2015-07-02 13:39:57.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java	2015-07-02 13:39:57.000000000 +0300
@@ -37,6 +37,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JTableInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java	2015-07-02 13:39:58.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java	2015-07-02 13:39:57.000000000 +0300
@@ -33,6 +33,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JTableOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java	2015-07-02 13:39:58.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java	2015-07-02 13:39:58.000000000 +0300
@@ -35,6 +35,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JTextAreaInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java	2015-07-02 13:39:58.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java	2015-07-02 13:39:58.000000000 +0300
@@ -34,6 +34,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JTextAreaOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java	2015-07-02 13:39:59.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java	2015-07-02 13:39:59.000000000 +0300
@@ -35,6 +35,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JTextFieldInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java	2015-07-02 13:39:59.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java	2015-07-02 13:39:59.000000000 +0300
@@ -34,6 +34,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JTextFieldOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java	2015-07-02 13:40:00.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java	2015-07-02 13:39:59.000000000 +0300
@@ -34,6 +34,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JToggleButtonInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java	2015-07-02 13:40:00.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java	2015-07-02 13:40:00.000000000 +0300
@@ -33,6 +33,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main JToggleButtonOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java	2015-07-02 13:40:00.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java	2015-07-02 13:40:00.000000000 +0300
@@ -43,6 +43,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main MixingFrameResizing
  */
--- old/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java	2015-07-02 13:40:01.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java	2015-07-02 13:40:01.000000000 +0300
@@ -47,6 +47,7 @@
 @summary Opaque overlapping test for each AWT component
 @library ../../regtesthelpers
 @modules java.desktop/com.sun.awt
+         java.desktop/java.awt.peer
          java.desktop/sun.awt
 @build Util
 @run main OpaqueOverlapping
--- old/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java	2015-07-02 13:40:01.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java	2015-07-02 13:40:01.000000000 +0300
@@ -33,6 +33,7 @@
 @summary Opaque overlapping test for Choice AWT component
 @library ../../regtesthelpers
 @modules java.desktop/com.sun.awt
+         java.desktop/java.awt.peer
          java.desktop/sun.awt
 @build Util
 @run main OpaqueOverlappingChoice
--- old/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java	2015-07-02 13:40:02.000000000 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java	2015-07-02 13:40:01.000000000 +0300
@@ -52,6 +52,7 @@
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
 @modules java.desktop/sun.awt
+         java.desktop/java.awt.peer
 @build Util
 @run main ViewportOverlapping
  */
--- old/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java	2015-07-02 13:40:02.000000000 +0300
+++ new/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java	2015-07-02 13:40:02.000000000 +0300
@@ -29,6 +29,8 @@
 /* @test
  * @bug 7129742
  * @summary Focus in non-editable TextArea is not shown on Linux.
+ * @modules java.desktop/sun.awt
+ *          java.desktop/java.awt.peer
  * @author Sean Chou
  */
 
--- old/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java	2015-07-02 13:40:02.000000000 +0300
+++ new/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java	2015-07-02 13:40:02.000000000 +0300
@@ -36,6 +36,8 @@
  * @author Hendrik Schreiber
  * @summary [macosx] Drag image of TransferHandler does not honor
  * MultiResolutionImage
+ * @modules java.desktop/sun.awt.image
+ *          java.desktop/sun.java2d
  * @run main MultiResolutionDragImageTest TEST_DRAG
  */
 public class MultiResolutionDragImageTest {
@@ -169,4 +171,4 @@
         graphics.dispose();
         return image;
     }
-}
\ No newline at end of file
+}
--- old/test/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java	2015-07-02 13:40:03.000000000 +0300
+++ new/test/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java	2015-07-02 13:40:03.000000000 +0300
@@ -26,6 +26,8 @@
   @bug 6359129
   @summary REGRESSION: Popup menus dont respond to selections when extend outside Applet
   @author oleg.sukhodolsky area=awt.grab
+  @modules java.desktop/java.awt.peer
+           java.desktop/sun.awt
   @library ../../regtesthelpers
   @build Util UtilInternal
   @run main EmbeddedFrameTest1
--- old/test/java/awt/xembed/server/TestXEmbedServer.java	2015-07-02 13:40:03.000000000 +0300
+++ new/test/java/awt/xembed/server/TestXEmbedServer.java	2015-07-02 13:40:03.000000000 +0300
@@ -27,6 +27,8 @@
 import java.io.*;
 import java.util.logging.*;
 import sun.awt.WindowIDProvider;
+import sun.awt.AWTAccessor;
+import sun.awt.AWTAccessor.ComponentAccessor;
 import java.awt.dnd.*;
 import java.awt.datatransfer.*;
 
@@ -182,7 +184,8 @@
         client.setBackground(new Color(30, 220, 40));
         clientCont.add(client);
         clientCont.validate();
-        WindowIDProvider pid = (WindowIDProvider)client.getPeer();
+        final ComponentAccessor acc = AWTAccessor.getComponentAccessor(); 
+        WindowIDProvider pid = (WindowIDProvider)acc.getPeer(client);
         log.fine("Added XEmbed server(Canvas) with X window ID " + pid.getWindow());
         Rectangle toFocusBounds = toFocus.getBounds();
         toFocusBounds.setLocation(toFocus.getLocationOnScreen());
--- old/test/javax/swing/JFileChooser/8080628/bug8080628.java	2015-07-02 13:40:04.000000000 +0300
+++ new/test/javax/swing/JFileChooser/8080628/bug8080628.java	2015-07-02 13:40:03.000000000 +0300
@@ -33,6 +33,7 @@
  * @bug 8080628
  * @summary No mnemonics on Open and Save buttons in JFileChooser.
  * @author Alexey Ivanov
+ * @modules java.desktop/sun.swing
  * @run main bug8080628
  */
 public class bug8080628 {
--- old/test/javax/swing/JRadioButton/8075609/bug8075609.java	2015-07-02 13:40:04.000000000 +0300
+++ new/test/javax/swing/JRadioButton/8075609/bug8075609.java	2015-07-02 13:40:04.000000000 +0300
@@ -35,11 +35,9 @@
 import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
-import sun.awt.SunToolkit;
 
 public class bug8075609 {
     private static Robot robot;
-    private static SunToolkit toolkit;
     private static JTextField textField;
 
     public static void main(String args[]) throws Throwable {
@@ -53,7 +51,6 @@
         Thread.sleep(100);
 
         robot.setAutoDelay(100);
-        toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
 
         // Radio button group tab key test
         runTest1();
@@ -96,10 +93,10 @@
     private static void runTest1() throws Exception{
         hitKey(robot, KeyEvent.VK_TAB);
 
-        robot.setAutoDelay(1000 );
+        robot.delay(1000 );
         SwingUtilities.invokeAndWait(new Runnable() {
             public void run() {
-                if (textField.hasFocus()) {
+                if (!textField.hasFocus()) {
                     System.out.println("Radio Button Group Go To Next Component through Tab Key failed");
                     throw new RuntimeException("Focus is not on textField as Expected");
                 }
@@ -110,6 +107,6 @@
     private static void hitKey(Robot robot, int keycode) {
         robot.keyPress(keycode);
         robot.keyRelease(keycode);
-        toolkit.realSync();
+        robot.waitForIdle();
     }
 }
--- old/test/javax/swing/RepaintManager/6608456/bug6608456.java	2015-07-02 13:40:04.000000000 +0300
+++ new/test/javax/swing/RepaintManager/6608456/bug6608456.java	2015-07-02 13:40:04.000000000 +0300
@@ -25,6 +25,7 @@
  *
  * @bug 6608456
  * @author Igor Kushnirskiy
+ * @modules java.desktop/com.sun.java.swing
  * @summary tests if delegate RepaintManager gets invoked.
  */
 
--- old/test/javax/swing/RepaintManager/DisplayListenerLeak/DisplayListenerLeak.java	2015-07-02 13:40:05.000000000 +0300
+++ new/test/javax/swing/RepaintManager/DisplayListenerLeak/DisplayListenerLeak.java	2015-07-02 13:40:05.000000000 +0300
@@ -34,6 +34,7 @@
 /**
  * @test
  * @bug 8041654
+ * @modules java.desktop/sun.java2d
  * @run main/othervm -Xmx80m DisplayListenerLeak
  */
 public final class DisplayListenerLeak {
@@ -79,4 +80,4 @@
             throw new RuntimeException();
         }
     }
-}
\ No newline at end of file
+}
--- old/test/sun/java2d/SunGraphicsEnvironment/TestSGEuseAlternateFontforJALocales.java	2015-07-02 13:40:05.000000000 +0300
+++ new/test/sun/java2d/SunGraphicsEnvironment/TestSGEuseAlternateFontforJALocales.java	2015-07-02 13:40:05.000000000 +0300
@@ -28,6 +28,7 @@
  * @summary verify the existence of the  method
  *           SunGraphicsEnvironment.useAlternateFontforJALocales
  *
+ * @modules java.desktop/sun.java2d
  * @run main/othervm TestSGEuseAlternateFontforJALocales
  * @run main/othervm -Dfile.encoding=windows-31j -Duser.language=ja -Duser.country=JA TestSGEuseAlternateFontforJALocales
  *