--- old/test/Makefile	2011-09-21 18:02:10.500451875 +0800
+++ new/test/Makefile	2011-09-21 18:02:09.950451875 +0800
@@ -357,15 +357,19 @@
 ifndef USE_JTREG_SAMEVM
   USE_JTREG_SAMEVM=false
 endif
-# With samevm, you cannot use -javaoptions?
+# With samevm, you cannot use -javaoptions? (-agentvm is more reliable -samevm)
 ifeq ($(USE_JTREG_SAMEVM),true)
-  JTREG_SAMEVM_OPTION = -samevm
+  JTREG_SAMEVM_OPTION = -agentvm
   EXTRA_JTREG_OPTIONS += $(JTREG_SAMEVM_OPTION) $(JAVA_ARGS) $(JAVA_ARGS:%=-vmoption:%)
   JTREG_TEST_OPTIONS = $(JAVA_VM_ARGS:%=-vmoption:%)
 else
   JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
 endif
 
+ifdef CONCURRENCY
+  EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
+endif
+
 # Some tests annoy me and fail frequently
 PROBLEM_LIST=ProblemList.txt
 PROBLEM_LISTS=$(PROBLEM_LIST) $(wildcard closed/$(PROBLEM_LIST))
--- old/test/com/sun/jdi/sde/MangleStepTest.java	2011-09-21 18:02:11.560451875 +0800
+++ new/test/com/sun/jdi/sde/MangleStepTest.java	2011-09-21 18:02:11.000451875 +0800
@@ -10,11 +10,11 @@
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE
  *  @run compile MangleStepTest.java
  *  @run compile -g  onion/pickle/Mangle.java
- *  @run main MangleStepTest unset
- *  @run main MangleStepTest Java
- *  @run main MangleStepTest XYZ
- *  @run main MangleStepTest Rats
- *  @run main MangleStepTest bogus
+ *  @run main/othervm MangleStepTest unset
+ *  @run main/othervm MangleStepTest Java
+ *  @run main/othervm MangleStepTest XYZ
+ *  @run main/othervm MangleStepTest Rats
+ *  @run main/othervm MangleStepTest bogus
  */
 import com.sun.jdi.*;
 import com.sun.jdi.event.*;
--- old/test/java/util/logging/ParentLoggersTest.java	2011-09-21 18:02:12.600451875 +0800
+++ new/test/java/util/logging/ParentLoggersTest.java	2011-09-21 18:02:12.040451875 +0800
@@ -6,7 +6,7 @@
  * @author  ss45998
  *
  * @build ParentLoggersTest
- * @run main ParentLoggersTest
+ * @run main/othervm ParentLoggersTest
  */
 
 /*