--- old/test/jdk/tools/jlink/JLinkTest.java	2018-01-22 16:08:40.000000000 -0800
+++ new/test/jdk/tools/jlink/JLinkTest.java	2018-01-22 16:08:40.000000000 -0800
@@ -44,6 +44,7 @@
  * @summary Test image creation
  * @bug 8189777
  * @author Jean-Francois Denise
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../lib
  * @modules java.base/jdk.internal.jimage
  *          jdk.jdeps/com.sun.tools.classfile
@@ -52,7 +53,7 @@
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
  * @build tests.*
- * @run main/othervm -Xmx1g JLinkTest
+ * @run main/othervm/timeout=300 -Xmx1g JLinkTest
  */
 public class JLinkTest {
     static final ToolProvider JLINK_TOOL = ToolProvider.findFirst("jlink")