--- old/hotspot/test/runtime/valhalla/valuetypes/VboxUnbox.java	2017-09-15 12:05:17.000000000 -0700
+++ new/hotspot/test/runtime/valhalla/valuetypes/VboxUnbox.java	2017-09-15 12:05:17.000000000 -0700
@@ -23,13 +23,17 @@
 package runtime.valhalla.valuetypes;
 
 import java.lang.invoke.*;
-import jdk.experimental.value.*;
+
+import jdk.experimental.value.MethodHandleBuilder;
+import jdk.incubator.mvt.ValueType;
 
 import static jdk.test.lib.Asserts.*;
 
 /*
  * @test VboxUnbox
  * @summary Exercise vbox & vunbox bytecodes
+ * @modules java.base/jdk.experimental.value
+ *          jdk.incubator.mvt
  * @library /test/lib
  * @build runtime.valhalla.valuetypes.ValueCapableClass
  * @run main/othervm -Xint -noverify -XX:+EnableMVT runtime.valhalla.valuetypes.VboxUnbox