--- 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");