--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/ConstantPhiTest.java	2017-03-20 17:39:15.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/ConstantPhiTest.java	2017-03-20 17:39:15.000000000 -0700
@@ -24,15 +24,13 @@
 
 import static org.graalvm.compiler.api.directives.GraalDirectives.LIKELY_PROBABILITY;
 import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability;
-
+import static org.graalvm.compiler.core.common.GraalOptions.MaximumInliningSize;
 import java.lang.reflect.Method;
 
 import org.junit.Test;
 
-import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.jtt.JTTTest;
-import org.graalvm.compiler.options.OptionValue;
-import org.graalvm.compiler.options.OptionValue.OverrideScope;
+import org.graalvm.compiler.options.OptionValues;
 
 public class ConstantPhiTest extends JTTTest {
 
@@ -59,24 +57,18 @@
     @Test
     @SuppressWarnings("try")
     public void run0() {
-        try (OverrideScope os = OptionValue.override(GraalOptions.MaximumInliningSize, -1)) {
-            runTest("test", 0, 0xDEADDEAD);
-        }
+        runTest(new OptionValues(getInitialOptions(), MaximumInliningSize, -1), "test", 0, 0xDEADDEAD);
     }
 
     @Test
     @SuppressWarnings("try")
     public void run1() {
-        try (OverrideScope os = OptionValue.override(GraalOptions.MaximumInliningSize, -1)) {
-            runTest("test", -1, 0xDEADDEAD);
-        }
+        runTest(new OptionValues(getInitialOptions(), MaximumInliningSize, -1), "test", -1, 0xDEADDEAD);
     }
 
     @Test
     @SuppressWarnings("try")
     public void run2() {
-        try (OverrideScope os = OptionValue.override(GraalOptions.MaximumInliningSize, -1)) {
-            runTest("test", 1, 0xDEADDEAD);
-        }
+        runTest(new OptionValues(getInitialOptions(), MaximumInliningSize, -1), "test", 1, 0xDEADDEAD);
     }
 }