test/jdk/jshell/UserExecutionControlTest.java

@@ -21,28 +21,29 @@
  * questions.
  */
 
 /*
  * @test
- * @bug 8156101
+ * @bug 8156101 8159935 8159122
  * @summary Tests for ExecutionControl SPI
- * @build KullaTesting LocalExecutionControl ExecutionControlTestBase
+ * @build KullaTesting ExecutionControlTestBase
  * @run testng UserExecutionControlTest
  */
 
 
+import jdk.jshell.execution.LocalExecutionControl;
 import org.testng.annotations.Test;
 import static org.testng.Assert.assertEquals;
 import org.testng.annotations.BeforeMethod;
 
 @Test
 public class UserExecutionControlTest extends ExecutionControlTestBase {
 
     @BeforeMethod
     @Override
     public void setUp() {
-        setUp(new LocalExecutionControl());
+        setUp(builder -> builder.executionEngine(LocalExecutionControl.create()));
     }
 
     public void verifyLocal() throws ClassNotFoundException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
         System.setProperty("LOCAL_CHECK", "TBD");
         assertEquals(System.getProperty("LOCAL_CHECK"), "TBD");