--- a/langtools/test/jdk/jshell/UserExecutionControlTest.java	Wed Dec 14 16:32:07 2016 +0100
+++ b/langtools/test/jdk/jshell/UserExecutionControlTest.java	Wed Dec 21 20:14:39 2016 -0800
@@ -23,14 +23,13 @@
 
 /*
  * @test
- * @bug 8156101 8159935 8159122
+ * @bug 8156101 8159935 8159122 8168615
  * @summary Tests for ExecutionControl SPI
  * @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;
@@ -41,12 +40,13 @@
     @BeforeMethod
     @Override
     public void setUp() {
-        setUp(builder -> builder.executionEngine(LocalExecutionControl.create()));
+        setUp(builder -> builder.executionEngine("local"));
     }
 
     public void verifyLocal() throws ClassNotFoundException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
         System.setProperty("LOCAL_CHECK", "TBD");
         assertEquals(System.getProperty("LOCAL_CHECK"), "TBD");
+        assertEval("System.getProperty(\"LOCAL_CHECK\")", "\"TBD\"");
         assertEval("System.setProperty(\"LOCAL_CHECK\", \"local\")");
         assertEquals(System.getProperty("LOCAL_CHECK"), "local");
     }