--- old/hotspot/test/compiler/valhalla/valuetypes/ValueTypeTestBench.java	2017-09-14 22:57:48.000000000 -0700
+++ new/hotspot/test/compiler/valhalla/valuetypes/ValueTypeTestBench.java	2017-09-14 22:57:47.000000000 -0700
@@ -27,7 +27,9 @@
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox /
  * @requires os.simpleArch == "x64"
- * @modules java.base/jdk.internal.misc:+open
+ * @modules java.base/jdk.experimental.value
+ *          java.base/jdk.internal.misc:+open
+ *          jdk.incubator.mvt
  * @compile -XDenableValueTypes ValueCapableClass1.java ValueCapableClass2.java ValueTypeTestBench.java
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main ClassFileInstaller jdk.test.lib.Platform
@@ -42,7 +44,7 @@
  *                   -XX:+EnableValhalla -XX:+EnableMVT -XX:-ValueTypePassFieldsAsArgs -XX:-ValueTypeReturnedAsFields -XX:-ValueArrayFlatten
  *                   -Djdk.lang.reflect.DVT=true
  *                   compiler.valhalla.valuetypes.ValueTypeTestBench
- * @run main/othervm -Xbootclasspath/a:. -ea -noverify -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/timeout=200 -Xbootclasspath/a:. -ea -noverify -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+UnlockExperimentalVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:+AlwaysIncrementalInline
  *                   -XX:+EnableValhalla -XX:+EnableMVT -XX:+ValueTypePassFieldsAsArgs -XX:+ValueTypeReturnedAsFields -XX:+ValueArrayFlatten
  *                   -XX:ValueArrayElemMaxFlatSize=-1 -XX:ValueArrayElemMaxFlatOops=-1
@@ -53,7 +55,8 @@
 package compiler.valhalla.valuetypes;
 
 import compiler.whitebox.CompilerWhiteBoxTest;
-import jdk.internal.misc.Unsafe;
+import jdk.experimental.value.MethodHandleBuilder;
+import jdk.incubator.mvt.ValueType;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.management.InputArguments;
 import jdk.test.lib.Platform;
@@ -75,7 +78,6 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import jdk.experimental.value.*;
 
 // Test value types
 __ByValue final class MyValue1 {