--- old/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java	2015-08-06 03:34:47.353085843 -0700
+++ new/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java	2015-08-06 03:34:47.228079225 -0700
@@ -2,9 +2,11 @@
   @test
   @bug 4980592
   @summary switching user in XP causes an NPE in sun.awt.windows.WWindowPeer.displayChanged
-  @author son@sparc.spb.su: area=embedded
+  @requires (os.family == "windows")
   @modules java.desktop/java.awt.peer
-           java.desktop/sun.awt
+  @modules java.desktop/sun.awt.windows
+  @modules java.desktop/sun.awt
+  @author son@sparc.spb.su: area=embedded
   @run main DisplayChangedTest
 */
 
--- old/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java	2015-08-06 03:34:47.755107130 -0700
+++ new/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java	2015-08-06 03:34:47.637100881 -0700
@@ -2,9 +2,11 @@
   @test
   @bug 6345002
   @summary grab problems with EmbeddedFrame
-  @author Oleg.Semenov@sun.com area=EmbeddedFrame
+  @requires (os.family == "windows")
   @modules java.desktop/java.awt.peer
-           java.desktop/sun.awt
+  @modules java.desktop/sun.awt
+  @modules java.desktop/sun.awt.windows
+  @author Oleg.Semenov@sun.com area=EmbeddedFrame
   @run main EmbeddedFrameGrabTest
 */