diff --git a/test/Makefile b/test/Makefile
index 055ddb9ffe680b554278cd1a61e3599a5d364af1..e91844ecebbdf49fd43493abdc8d492c0a77e28c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -262,6 +262,8 @@ endif
 # Default JTREG to run
 JTREG = $(JT_HOME)/bin/jtreg
 
+# Use agent mode
+JTREG_BASIC_OPTIONS += -agentvm
 # Only run automatic tests
 JTREG_BASIC_OPTIONS += -a
 # Report details on all failed or error tests, times too
diff --git a/test/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java b/test/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java
index 1695c35558a8176d547e51a60b196a874f2b68bd..120ab28b30417c1e6e2c5c6f700cad89ed10d73d 100644
--- a/test/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java
+++ b/test/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java
@@ -26,7 +26,7 @@
  * @bug 8042235
  * @summary redefining method used by multiple MethodHandles crashes VM
  * @compile -XDignore.symbol.file RedefineMethodUsedByMultipleMethodHandles.java
- * @run main RedefineMethodUsedByMultipleMethodHandles
+ * @run main/othervm RedefineMethodUsedByMultipleMethodHandles
  */
 
 import java.io.*;
diff --git a/test/sanity/WhiteBox.java b/test/sanity/MismatchedWhiteBox/WhiteBox.java
similarity index 100%
rename from test/sanity/WhiteBox.java
rename to test/sanity/MismatchedWhiteBox/WhiteBox.java
diff --git a/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java b/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java
index 1953d182ff99c2b4cc6a78087bd01cd1dda85f91..4895fe1d94caf26154359f42a67e6ac587c5211f 100644
--- a/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java
+++ b/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java
@@ -152,6 +152,9 @@ public final class ProcessTools {
     args.add(javapath);
     Collections.addAll(args, getPlatformSpecificVMArgs());
 
+    args.add("-cp");
+    args.add(System.getProperty("java.class.path"));
+
     if (addTestVmOptions) {
       String vmopts = System.getProperty("test.vm.opts");
       if (vmopts != null && vmopts.length() > 0) {