--- old/src/share/vm/runtime/arguments.cpp	2017-03-15 09:56:19.961053252 +0100
+++ new/src/share/vm/runtime/arguments.cpp	2017-03-15 09:56:16.512054903 +0100
@@ -2489,6 +2489,12 @@
     FLAG_SET_CMDLINE(bool, ValueTypePassFieldsAsArgs, false);
     warning("ValueTypePassFieldsAsArgs is not supported on this platform");
   }
+
+  if (FLAG_IS_DEFAULT(TieredCompilation)) {
+    // C1 has no support for value types
+    TieredCompilation = false;
+  }
+
   return status;
 }
 
--- old/test/runtime/valhalla/valuetypes/DeriveValueTypeCreation.java	2017-03-15 09:56:23.702051462 +0100
+++ new/test/runtime/valhalla/valuetypes/DeriveValueTypeCreation.java	2017-03-15 09:56:20.290053095 +0100
@@ -42,7 +42,7 @@
  * @summary Derive Value Type creation test
  * @library /testlibrary /
  * @build runtime.valhalla.valuetypes.ValueCapableClass
- * @run main/othervm -Xint -noverify runtime.valhalla.valuetypes.DeriveValueTypeCreation
+ * @run main/othervm -noverify runtime.valhalla.valuetypes.DeriveValueTypeCreation
  */
 public class DeriveValueTypeCreation {
 
--- old/test/runtime/valhalla/valuetypes/InvokeDirect.java	2017-03-15 09:56:27.412049687 +0100
+++ new/test/runtime/valhalla/valuetypes/InvokeDirect.java	2017-03-15 09:56:23.997051321 +0100
@@ -6,7 +6,7 @@
  * @test InvokeDirect
  * @summary Value Type invokedirect bytecode test (incomplete until type system defn done)
  * @library /testlibrary /
- * @run main/othervm -noverify -Xint runtime.valhalla.valuetypes.InvokeDirect
+ * @run main/othervm -noverify runtime.valhalla.valuetypes.InvokeDirect
  */
 public class InvokeDirect {
     public static void main(String[] args) {
--- old/test/runtime/valhalla/valuetypes/VDefaultTest.java	2017-03-15 09:56:31.705047632 +0100
+++ new/test/runtime/valhalla/valuetypes/VDefaultTest.java	2017-03-15 09:56:27.706049546 +0100
@@ -29,7 +29,7 @@
  * @test VDefaultTest
  * @summary vdefault bytecode test
  * @library /testlibrary /
- * @run main/othervm -noverify -Xint runtime.valhalla.valuetypes.VDefaultTest
+ * @run main/othervm -noverify runtime.valhalla.valuetypes.VDefaultTest
  */
 
 public class VDefaultTest {
--- old/test/runtime/valhalla/valuetypes/VWithFieldTest.java	2017-03-15 09:56:41.015043176 +0100
+++ new/test/runtime/valhalla/valuetypes/VWithFieldTest.java	2017-03-15 09:56:32.040047472 +0100
@@ -29,7 +29,7 @@
  * @test VWithFieldTest
  * @summary vwithfield bytecode test
  * @library /testlibrary /
- * @run main/othervm -noverify -Xint runtime.valhalla.valuetypes.VWithFieldTest
+ * @run main/othervm -noverify runtime.valhalla.valuetypes.VWithFieldTest
  */
 
 public class VWithFieldTest {
--- old/test/runtime/valhalla/valuetypes/ValueTypeArray.java	2017-03-15 09:56:45.461041049 +0100
+++ new/test/runtime/valhalla/valuetypes/ValueTypeArray.java	2017-03-15 09:56:41.375043004 +0100
@@ -31,8 +31,8 @@
  * @test ValueTypeArray
  * @summary Plain array test for Value Types
  * @library /testlibrary /
- * @run main/othervm -noverify -Xint -XX:+ValueArrayFlatten runtime.valhalla.valuetypes.ValueTypeArray
- * @run main/othervm -noverify -Xint -XX:-ValueArrayFlatten runtime.valhalla.valuetypes.ValueTypeArray
+ * @run main/othervm -noverify -XX:+ValueArrayFlatten runtime.valhalla.valuetypes.ValueTypeArray
+ * @run main/othervm -noverify -XX:-ValueArrayFlatten runtime.valhalla.valuetypes.ValueTypeArray
  */
 public class ValueTypeArray {
     public static void main(String[] args) {
--- old/test/runtime/valhalla/valuetypes/ValueTypeCreation.java	2017-03-15 09:56:49.770038987 +0100
+++ new/test/runtime/valhalla/valuetypes/ValueTypeCreation.java	2017-03-15 09:56:45.800040886 +0100
@@ -6,7 +6,7 @@
  * @test ValueTypeCreation
  * @summary Value Type creation test
  * @library /testlibrary /
- * @run main/othervm -noverify -Xint runtime.valhalla.valuetypes.ValueTypeCreation
+ * @run main/othervm -noverify runtime.valhalla.valuetypes.ValueTypeCreation
  */
 public class ValueTypeCreation {
     public static void main(String[] args) {
--- old/test/runtime/valhalla/valuetypes/ValueTypeDensity.java	2017-03-15 09:56:54.057036935 +0100
+++ new/test/runtime/valhalla/valuetypes/ValueTypeDensity.java	2017-03-15 09:56:50.087038835 +0100
@@ -35,7 +35,7 @@
  *        ValueTypeDensity
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -noverify -Xint -XX:+ValueArrayFlatten -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ValueTypeDensity
+ * @run main/othervm -noverify -XX:+ValueArrayFlatten -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ValueTypeDensity
  */
 
 public class ValueTypeDensity {
--- old/test/runtime/valhalla/valuetypes/ValueTypeGetField.java	2017-03-15 09:56:58.357034877 +0100
+++ new/test/runtime/valhalla/valuetypes/ValueTypeGetField.java	2017-03-15 09:56:54.376036782 +0100
@@ -6,7 +6,7 @@
  * @test ValueTypeGetField
  * @summary Value Type get field test
  * @library /testlibrary /
- * @run main/othervm -noverify -Xint runtime.valhalla.valuetypes.ValueTypeGetField
+ * @run main/othervm -noverify runtime.valhalla.valuetypes.ValueTypeGetField
  */
 public class ValueTypeGetField {
 
--- old/test/runtime/valhalla/valuetypes/VboxUnbox.java	2017-03-15 09:57:02.074033098 +0100
+++ new/test/runtime/valhalla/valuetypes/VboxUnbox.java	2017-03-15 09:56:58.668034728 +0100
@@ -32,7 +32,7 @@
  * @summary Exercise vbox & vunbox bytecodes
  * @library /testlibrary /
  * @build runtime.valhalla.valuetypes.ValueCapableClass
- * @run main/othervm -Xint -noverify runtime.valhalla.valuetypes.VboxUnbox
+ * @run main/othervm -noverify runtime.valhalla.valuetypes.VboxUnbox
  *
  * To dump generated byte-code, add "-Dvalhalla.dumpIsolatedMethodClasses=/tmp/foo"
  */