--- old/test/jdk/tools/jlink/DefaultProviderTest.java	2018-01-22 16:08:38.000000000 -0800
+++ new/test/jdk/tools/jlink/DefaultProviderTest.java	2018-01-22 16:08:38.000000000 -0800
@@ -40,6 +40,7 @@
  * @test
  * @summary Test plugins enabled by default
  * @author Jean-Francois Denise
+ * @requires vm.compMode != "Xcomp"
  * @library ../lib
  * @modules java.base/jdk.internal.jimage
  *          jdk.jdeps/com.sun.tools.classfile
@@ -49,7 +50,7 @@
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
  * @build tests.*
- * @run main/othervm DefaultProviderTest
+ * @run main/othervm/timeout=300 DefaultProviderTest
  */
 public class DefaultProviderTest {
     private static final String NAME = "disable-toto";
--- old/test/jdk/tools/jlink/JLinkPluginsTest.java	2018-01-22 16:08:39.000000000 -0800
+++ new/test/jdk/tools/jlink/JLinkPluginsTest.java	2018-01-22 16:08:39.000000000 -0800
@@ -33,6 +33,7 @@
  * @test
  * @summary Test image creation
  * @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
@@ -41,7 +42,7 @@
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
  * @build tests.*
- * @run main/othervm -verbose:gc -Xmx1g JLinkPluginsTest
+ * @run main/othervm/timeout=300 -verbose:gc -Xmx1g JLinkPluginsTest
  */
 public class JLinkPluginsTest {
 
--- 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")
--- old/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java	2018-01-22 16:08:41.000000000 -0800
+++ new/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java	2018-01-22 16:08:41.000000000 -0800
@@ -43,6 +43,7 @@
  * @bug 8152143 8152704 8155649 8165804 8185841 8176841 8190918
  * @summary IncludeLocalesPlugin tests
  * @author Naoto Sato
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib
  * @modules java.base/jdk.internal.jimage
  *          jdk.jdeps/com.sun.tools.classfile
@@ -54,7 +55,7 @@
  *          jdk.compiler
  * @build tests.*
  * @build tools.jlink.plugins.GetAvailableLocales
- * @run main/othervm -Xmx1g IncludeLocalesPluginTest
+ * @run main/othervm/timeout=300 -Xmx1g IncludeLocalesPluginTest
  */
 public class IncludeLocalesPluginTest {