diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java
index c0bfe91a750..b3c364a8dfe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java
@@ -311,7 +311,7 @@ public class filter003 extends JDIBase {
 
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -327,30 +327,6 @@ public class filter003 extends JDIBase {
         return;
     }
 
-    protected void breakpointForCommunication()
-            throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
     // ============================== test's additional methods
 
     private ClassPrepareRequest setting22ClassPrepareRequest ( String testedClass,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java
index 9be0d89a4b9..0ab2c332e22 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java
@@ -264,7 +264,7 @@ public class filter_rt002 extends JDIBase {
         for (int i = 0; ; i++) {
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -334,30 +334,6 @@ public class filter_rt002 extends JDIBase {
         return;
     }
 
-    protected void breakpointForCommunication()
-            throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
     // ============================== test's additional methods
 
     private ClassPrepareRequest setting21ClassPrepareRequest ( ReferenceType  testedClass,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java
index 1cc0dff5c99..20dd7839953 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java
@@ -267,7 +267,7 @@ public class filter_s002 extends JDIBase {
         for (int i = 0; ; i++) {
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -332,29 +332,6 @@ public class filter_s002 extends JDIBase {
         log1("    TESTING ENDS");
         return;
     }
-    protected void breakpointForCommunication()
-            throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
 
     // ============================== test's additional methods
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java
index b2905b6527e..bbf36fbd319 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java
@@ -260,7 +260,7 @@ public class clsprepreq002 extends JDIBase {
         for (int i = 0; ; i++) {
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -366,28 +366,4 @@ public class clsprepreq002 extends JDIBase {
         return;
     }
 
-    protected void breakpointForCommunication()
-            throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java
index f975441a9ba..a36534fc483 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java
@@ -259,7 +259,7 @@ public class methexitreq002 extends JDIBase {
         for (int i = 0; ; i++) {
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -360,28 +360,4 @@ public class methexitreq002 extends JDIBase {
         return;
     }
 
-    protected void breakpointForCommunication()
-                 throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java
index 6e293a98670..8996798d44c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java
@@ -263,7 +263,7 @@ public class filter002 extends JDIBase {
         for (int i = 0; ; i++) {
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -331,32 +331,6 @@ public class filter002 extends JDIBase {
         return;
     }
 
-    protected void breakpointForCommunication()
-                 throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
-
-
     // ============================== test's additional methods
 
     private MethodEntryRequest setting23MethodEntryRequest ( ThreadReference thread,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java
index 3fd039e10d1..4b779448b60 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java
@@ -263,7 +263,7 @@ public class filter002 extends JDIBase {
         for (int i = 0; ; i++) {
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -331,30 +331,6 @@ public class filter002 extends JDIBase {
         return;
     }
 
-    protected void breakpointForCommunication()
-                   throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
     // ============================== test's additional methods
 
     private MethodExitRequest setting23MethodExitRequest ( ThreadReference thread,