diff --git a/test/com/sun/jdi/ExceptionEvents.java b/test/com/sun/jdi/ExceptionEvents.java
index 88633b6fcde2e865e489f171b92a9605d25873bc..42a532e4c440a72ecb44ebb92361f76611d20f78 100644
--- a/test/com/sun/jdi/ExceptionEvents.java
+++ b/test/com/sun/jdi/ExceptionEvents.java
@@ -417,8 +417,12 @@ public class ExceptionEvents extends TestScaffold {
         request = eventRequestManager().createExceptionRequest(exceptionClass,
                                                                caught, uncaught);
         request.addClassExclusionFilter("java.*");
+        request.addClassExclusionFilter("javax.*");
         request.addClassExclusionFilter("sun.*");
         request.addClassExclusionFilter("com.sun.*");
+        request.addClassExclusionFilter("com.oracle.*");
+        request.addClassExclusionFilter("oracle.*");
+        request.addClassExclusionFilter("jdk.internal.*");
         request.setSuspendPolicy(suspendPolicy);
         request.enable();
 
diff --git a/test/com/sun/jdi/FilterNoMatch.java b/test/com/sun/jdi/FilterNoMatch.java
index 1feb8992f3a8b934b16c3fb423a51e4d68d88ab8..3a8ecd2abdb0cff0053bb01584820e0028504871 100644
--- a/test/com/sun/jdi/FilterNoMatch.java
+++ b/test/com/sun/jdi/FilterNoMatch.java
@@ -121,9 +121,13 @@ public class FilterNoMatch extends JDIScaffold {
 
         // We have to filter out all these so that they don't cause the
         // listener to be called.
-        request1.addClassExclusionFilter( "java.*");
-        request1.addClassExclusionFilter( "com.*");
-        request1.addClassExclusionFilter( "sun.*");
+        request1.addClassExclusionFilter("java.*");
+        request1.addClassExclusionFilter("javax.*");
+        request1.addClassExclusionFilter("sun.*");
+        request1.addClassExclusionFilter("com.sun.*");
+        request1.addClassExclusionFilter("com.oracle.*");
+        request1.addClassExclusionFilter("oracle.*");
+        request1.addClassExclusionFilter("jdk.internal.*");
 
         // We want our listener to be called if a pattern does not match.
         // So, here we want patterns that do not match HelloWorld.
diff --git a/test/com/sun/jdi/JDIScaffold.java b/test/com/sun/jdi/JDIScaffold.java
index e0a95dfbe091f958e8b6f3e3fbe2db5c8a66ea41..0c60c0767dd8040f3eaf27d1d65dbd3f4d978833 100644
--- a/test/com/sun/jdi/JDIScaffold.java
+++ b/test/com/sun/jdi/JDIScaffold.java
@@ -450,8 +450,12 @@ abstract public class JDIScaffold {
                   requestManager.createStepRequest(thread, gran, depth);
 
         sr.addClassExclusionFilter("java.*");
+        sr.addClassExclusionFilter("javax.*");
         sr.addClassExclusionFilter("sun.*");
         sr.addClassExclusionFilter("com.sun.*");
+        sr.addClassExclusionFilter("com.oracle.*");
+        sr.addClassExclusionFilter("oracle.*");
+        sr.addClassExclusionFilter("jdk.internal.*");
         sr.addCountFilter(1);
         sr.enable();
         StepEvent retEvent = (StepEvent)waitForRequestedEvent(sr);
diff --git a/test/com/sun/jdi/PopAndStepTest.java b/test/com/sun/jdi/PopAndStepTest.java
index c5487fe787dc02d134ee1d018fc89433c2c0fe43..76dc0f5038c2a564e4939c1003e55c408ecdf5cf 100644
--- a/test/com/sun/jdi/PopAndStepTest.java
+++ b/test/com/sun/jdi/PopAndStepTest.java
@@ -130,8 +130,12 @@ public class PopAndStepTest extends TestScaffold {
         StepRequest srInto = erm.createStepRequest(mainThread, StepRequest.STEP_LINE,
                                                    StepRequest.STEP_INTO);
         srInto.addClassExclusionFilter("java.*");
+        srInto.addClassExclusionFilter("javax.*");
         srInto.addClassExclusionFilter("sun.*");
         srInto.addClassExclusionFilter("com.sun.*");
+        srInto.addClassExclusionFilter("com.oracle.*");
+        srInto.addClassExclusionFilter("oracle.*");
+        srInto.addClassExclusionFilter("jdk.internal.*");
         srInto.addCountFilter(1);
         srInto.enable(); // This fails
         mainThread.popFrames(frameFor("A"));
diff --git a/test/com/sun/jdi/RepStep.java b/test/com/sun/jdi/RepStep.java
index 665dfb7984540610fed5f4d0d38e80e87e237adf..80ce449b3040a76fd4bf3fd83fba5afdb8eaf369 100644
--- a/test/com/sun/jdi/RepStep.java
+++ b/test/com/sun/jdi/RepStep.java
@@ -75,8 +75,12 @@ public class RepStep {
                                                    DEPTH);
 
         sr.addClassExclusionFilter("java.*");
+        sr.addClassExclusionFilter("javax.*");
         sr.addClassExclusionFilter("sun.*");
         sr.addClassExclusionFilter("com.sun.*");
+        sr.addClassExclusionFilter("com.oracle.*");
+        sr.addClassExclusionFilter("oracle.*");
+        sr.addClassExclusionFilter("jdk.internal.*");
         sr.enable();
     }
 
diff --git a/test/com/sun/jdi/TestScaffold.java b/test/com/sun/jdi/TestScaffold.java
index 61f8e053eaf2fe2958a393421614cee698b18411..5dc5640f91fb074fbf835d5449f946e6918b3259 100644
--- a/test/com/sun/jdi/TestScaffold.java
+++ b/test/com/sun/jdi/TestScaffold.java
@@ -746,8 +746,12 @@ abstract public class TestScaffold extends TargetAdapter {
                   requestManager.createStepRequest(thread, gran, depth);
 
         sr.addClassExclusionFilter("java.*");
+        sr.addClassExclusionFilter("javax.*");
         sr.addClassExclusionFilter("sun.*");
         sr.addClassExclusionFilter("com.sun.*");
+        sr.addClassExclusionFilter("com.oracle.*");
+        sr.addClassExclusionFilter("oracle.*");
+        sr.addClassExclusionFilter("jdk.internal.*");
         sr.addCountFilter(1);
         sr.enable();
         StepEvent retEvent = (StepEvent)waitForRequestedEvent(sr);
@@ -829,7 +833,8 @@ abstract public class TestScaffold extends TargetAdapter {
 
         Method method = findMethod(rt, methodName, methodSignature);
         if (method == null) {
-            throw new IllegalArgumentException("Bad method name/signature");
+            throw new IllegalArgumentException("Bad method name/signature: "
+                    + clsName + "." + methodName + ":" + methodSignature);
         }
 
         return resumeTo(method.location());