--- a/test/hotspot/jtreg/ProblemList.txt	Tue Mar 12 11:53:43 2019 +0100
+++ b/test/hotspot/jtreg/ProblemList.txt	Tue Mar 12 07:17:03 2019 -0400
@@ -158,7 +158,6 @@
 vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Deadlock/JavaDeadlock001/TestDescription.java 8060733 generic-all
 
 vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java 7034630 generic-all
-vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java 8013728 generic-all
 vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java 8066993 generic-all
 vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java 8065773 generic-all
 vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java 8065773 generic-all

--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001.java	Tue Mar 12 11:53:43 2019 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001.java	Tue Mar 12 07:17:03 2019 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,6 +62,7 @@
  */
 
 public class tc10x001 {
+    public final static String SGL_QUIT = "quit";
 
     public final static String UNEXPECTED_STRING = "***Unexpected exception ";
 
@@ -299,6 +300,8 @@
             } catch (Throwable e) {
                 complain(UNEXPECTED_STRING + e);
                 exitStatus = Consts.TEST_FAILED;
+            } finally {
+                debugee.sendSignal(tc10x001.SGL_QUIT); // Acknowledge debugee result received.
             }
         }
     }

--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/newclass/tc10x001a.java	Tue Mar 12 11:53:43 2019 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/newclass/tc10x001a.java	Tue Mar 12 07:17:03 2019 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,7 @@
         // brkpLineNumber // checkLastLine
         System.err.println("i = " + i);
         pipe.println("@" + i);
+        String instr = pipe.readln(); // Wait for debugger "quit"
         System.exit(Consts.TEST_PASSED + Consts.JCK_STATUS_BASE);
     }
 

--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001a.java	Tue Mar 12 11:53:43 2019 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001a.java	Tue Mar 12 07:17:03 2019 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,7 @@
 
         System.err.println("i = " + i); // brkpLineNumber // checkLastLine
         pipe.println("@" + i);
+        String instr = pipe.readln(); // Wait for debugger "quit"
         System.exit(Consts.TEST_PASSED + Consts.JCK_STATUS_BASE);
     }