--- old/test/valhalla/mvt/MVTAccessCheck.java	2017-07-27 15:26:02.610648185 +0200
+++ new/test/valhalla/mvt/MVTAccessCheck.java	2017-07-27 15:26:02.454648191 +0200
@@ -23,10 +23,10 @@
 
 /*
  * @test
- * @run testng/othervm -Xint -Xverify:none -XX:+EnableMVT -XX:+ValueArrayFlatten MVTAccessCheck
- * @run testng/othervm -Xint -Xverify:none -XX:+EnableMVT -XX:-ValueArrayFlatten MVTAccessCheck
- * @run testng/othervm -Xint -Xverify:none -XX:+EnableMVT -Dvalhalla.enableValueLambdaForms=true MVTAccessCheck
- * @run testng/othervm -Xint -Xverify:none -XX:+EnableMVT -Dvalhalla.enableValueLambdaForms=true -Dvalhalla.enablePoolPatches=true MVTAccessCheck
+ * @run testng/othervm -Xverify:none -XX:+EnableMVT -XX:+ValueArrayFlatten MVTAccessCheck
+ * @run testng/othervm -Xverify:none -XX:+EnableMVT -XX:-ValueArrayFlatten MVTAccessCheck
+ * @run testng/othervm -Xverify:none -XX:+EnableMVT -Dvalhalla.enableValueLambdaForms=true MVTAccessCheck
+ * @run testng/othervm -Xverify:none -XX:+EnableMVT -Dvalhalla.enableValueLambdaForms=true -Dvalhalla.enablePoolPatches=true MVTAccessCheck
  */
 
 import jdk.experimental.value.ValueType;
--- old/test/valhalla/mvt/MVTReflectionTest.java	2017-07-27 15:26:02.994648169 +0200
+++ new/test/valhalla/mvt/MVTReflectionTest.java	2017-07-27 15:26:02.838648176 +0200
@@ -25,7 +25,7 @@
  * @test
  * @summary basic test for reflection on MVT
  * @build Point
- * @run testng/othervm -Xint -Xverify:none -XX:+EnableMVT MVTReflectionTest
+ * @run testng/othervm -Xverify:none -XX:+EnableMVT MVTReflectionTest
  */
 
 import jdk.experimental.value.ValueType;
--- old/test/valhalla/mvt/MVTTest.java	2017-07-27 15:26:03.366648154 +0200
+++ new/test/valhalla/mvt/MVTTest.java	2017-07-27 15:26:03.210648161 +0200
@@ -23,10 +23,10 @@
 
 /*
  * @test
- * @run testng/othervm -Xint -Xverify:none -XX:+EnableMVT -XX:+ValueArrayFlatten MVTTest
- * @run testng/othervm -Xint -Xverify:none -XX:+EnableMVT -XX:-ValueArrayFlatten MVTTest
- * @run testng/othervm -Xint -Xverify:none -XX:+EnableMVT -Dvalhalla.enableValueLambdaForms=true MVTTest
- * @run testng/othervm -Xint -Xverify:none -XX:+EnableMVT -Dvalhalla.enableValueLambdaForms=true -Dvalhalla.enablePoolPatches=true MVTTest
+ * @run testng/othervm -Xverify:none -XX:+EnableMVT -XX:+ValueArrayFlatten MVTTest
+ * @run testng/othervm -Xverify:none -XX:+EnableMVT -XX:-ValueArrayFlatten MVTTest
+ * @run testng/othervm -Xverify:none -XX:+EnableMVT -Dvalhalla.enableValueLambdaForms=true MVTTest
+ * @run testng/othervm -Xverify:none -XX:+EnableMVT -Dvalhalla.enableValueLambdaForms=true -Dvalhalla.enablePoolPatches=true MVTTest
  */
 
 import jdk.experimental.value.ValueType;
--- old/test/valhalla/mvt/modules/Driver.java	2017-07-27 15:26:03.734648140 +0200
+++ new/test/valhalla/mvt/modules/Driver.java	2017-07-27 15:26:03.578648146 +0200
@@ -25,6 +25,6 @@
  * @test
  * @summary basic test for MVT in modules
  * @build m/* Driver
- * @run main/othervm -Xint -Xverify:none -XX:+EnableMVT m/p.Main
+ * @run main/othervm -Xverify:none -XX:+EnableMVT m/p.Main
  */
 
--- old/test/valhalla/mvt/point/TestPoint.java	2017-07-27 15:26:04.094648125 +0200
+++ new/test/valhalla/mvt/point/TestPoint.java	2017-07-27 15:26:03.942648131 +0200
@@ -40,7 +40,7 @@
 
 /*
  * @test
- * @run testng/othervm -Xint -Xverify:none -XX:+EnableMVT TestPoint
+ * @run testng/othervm -Xverify:none -XX:+EnableMVT TestPoint
  */
 
 @Test
--- old/test/valhalla/mvt/vector/VectorTest.java	2017-07-27 15:26:04.470648110 +0200
+++ new/test/valhalla/mvt/vector/VectorTest.java	2017-07-27 15:26:04.318648116 +0200
@@ -35,7 +35,7 @@
 
 /*
  * @test
- * @run testng/othervm -Xint -Xverify:none -XX:+EnableMVT VectorTest
+ * @run testng/othervm -Xverify:none -XX:+EnableMVT VectorTest
  */
 
 @Test