--- a/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java	Thu May 14 12:05:33 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java	Sat May 16 13:22:40 2015 -0700
@@ -33,7 +33,7 @@
  * @modules java.management
  * @run build jdk.testlibrary.* DummyMain
  * @run shell ../MakeJAR3.sh NoPremainAgent
- * @run main NoPremainAgentTest
+ * @run main/othervm -XX:-CreateCoredumpOnCrash NoPremainAgentTest
  */
 public class NoPremainAgentTest {
     // Use a javaagent without the premain() function.

--- a/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java	Thu May 14 12:05:33 2015 -0700
+++ b/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java	Sat May 16 13:22:40 2015 -0700
@@ -33,7 +33,7 @@
  * @modules java.management
  * @run build jdk.testlibrary.* DummyMain
  * @run shell ../MakeJAR3.sh ZeroArgPremainAgent
- * @run main ZeroArgPremainAgentTest
+ * @run main/othervm -XX:-CreateCoredumpOnCrash ZeroArgPremainAgentTest
  */
 public class ZeroArgPremainAgentTest {
     // Use a javaagent with a zero argument premain() function.

--- a/jdk/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java	Thu May 14 12:05:33 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java	Sat May 16 13:22:40 2015 -0700
@@ -21,12 +21,16 @@
  * questions.
  */
 
-/*
+/**
  * @test
  * @bug 6338874
  * @summary Check that notification dispatch is not linear in number of MBeans.
  * @author Eamonn McManus
  * @modules java.management
+ *
+ * @library /lib/testlibrary
+ * @run build jdk.testlibrary.* ListenerScaleTest
+ * @run main ListenerScaleTest
  */
 
 /*
@@ -67,6 +71,8 @@
 import javax.management.remote.JMXConnectorServerFactory;
 import javax.management.remote.JMXServiceURL;
 
+import jdk.testlibrary.Platform;
+
 public class ListenerScaleTest {
     private static final int WARMUP_WITH_ONE_MBEAN = 1000;
     private static final int NOTIFS_TO_TIME = 100;
@@ -126,6 +132,10 @@
         };
 
     public static void main(String[] args) throws Exception {
+        if (Platform.isDebugBuild()) {
+            System.out.println("Running on a debug build. Performance test not applicable. Skipping.");
+            return;
+        }
         MBeanServer mbs = MBeanServerFactory.newMBeanServer();
         Sender sender = new Sender();
         mbs.registerMBean(sender, testObjectName);