--- old/hotspot/test/runtime/valhalla/valuetypes/DeriveValueTypeCreation.java	2017-09-15 12:05:10.000000000 -0700
+++ new/hotspot/test/runtime/valhalla/valuetypes/DeriveValueTypeCreation.java	2017-09-15 12:05:10.000000000 -0700
@@ -22,6 +22,7 @@
  */
 package runtime.valhalla.valuetypes;
 
+import jdk.incubator.mvt.ValueType;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -31,7 +32,6 @@
 import java.util.HashMap;
 
 import jdk.experimental.bytecode.*;
-import jdk.experimental.value.ValueType;
 
 import jdk.internal.org.objectweb.asm.*;
 import static jdk.internal.org.objectweb.asm.Opcodes.*;
@@ -43,7 +43,9 @@
  * @summary Derive Value Type creation test
  * @library /test/lib
  * @compile DeriveValueTypeCreation.java
- * @modules java.base/jdk.internal.org.objectweb.asm
+ * @modules java.base/jdk.experimental.bytecode
+ *          java.base/jdk.internal.org.objectweb.asm
+ *          jdk.incubator.mvt
  * @build runtime.valhalla.valuetypes.ValueCapableClass
  * @run main/othervm -Xint -XX:+EnableMVT runtime.valhalla.valuetypes.DeriveValueTypeCreation
  * @run main/othervm -Xcomp -XX:+EnableMVT runtime.valhalla.valuetypes.DeriveValueTypeCreation
@@ -96,9 +98,6 @@
         if (vt.boxClass() != clazz) {
             fail("ValueType.boxClass() failed");
         }
-        if (vt.sourceClass() != clazz) {
-            fail("ValueType.sourceClass() failed");
-        }
 
         // DVT class matches our expectations for the current implementation...
         Class<?> vtClass = vt.valueClass();
@@ -179,7 +178,7 @@
         ClassWriter cw = new ClassWriter(0);
         cw.visit(52, klassAccess, name, null, superKlass, null);
         if (vccAnnotation ) {
-            cw.visitAnnotation("Ljvm/internal/value/ValueCapableClass;", true);
+            cw.visitAnnotation("Ljdk/incubator/mvt/ValueCapableClass;", true);
         }
         if (fieldType != null) {
             cw.visitField(fieldAccess, "x", fieldType, null, null);