--- old/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestArrays.java	2019-09-11 16:33:14.000000000 +0200
+++ new/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestArrays.java	2019-09-11 16:33:10.000000000 +0200
@@ -1836,7 +1836,7 @@
     }
 
     // Verify that casting an array element to a non-flattenable type marks the array as not-flat
-    @Test(valid = ValueTypeArrayFlattenOn, match = { ALLOC_G, LOAD_UNKNOWN_VALUE }, matchCount = { 1, 1 })
+    @Test(valid = ValueTypeArrayFlattenOn, failOn = ALLOC_G + LOAD_UNKNOWN_VALUE)
     @Test(valid = ValueTypeArrayFlattenOff, failOn = ALLOC_G + ALLOCA_G + LOAD_UNKNOWN_VALUE)
     public Object test79(Object[] array, int i) {
         Integer i1 = (Integer)array[0];
@@ -1863,7 +1863,7 @@
     }
 
     // Same as test80 but with not-flattenable inline type
-    @Test(valid = ValueTypeArrayFlattenOn, match = { ALLOC_G, LOAD_UNKNOWN_VALUE }, matchCount = { 1, 1 })
+    @Test(valid = ValueTypeArrayFlattenOn, failOn = ALLOC_G + LOAD_UNKNOWN_VALUE)
     @Test(valid = ValueTypeArrayFlattenOff, failOn = ALLOC_G + ALLOCA_G + LOAD_UNKNOWN_VALUE)
     public Object test80(Object[] array, int i) {
         NotFlattenable vt = (NotFlattenable)array[0];
@@ -1937,7 +1937,7 @@
     }
 
     // Verify that casting an array element to a non-inline type type marks the array as not-null-free and not-flat
-    @Test(valid = ValueTypeArrayFlattenOn, match = { ALLOC_G, LOAD_UNKNOWN_VALUE }, matchCount = { 1, 1 }, failOn = ALLOCA_G + STORE_UNKNOWN_VALUE + VALUE_ARRAY_NULL_GUARD)
+    @Test(valid = ValueTypeArrayFlattenOn, failOn = ALLOC_G + LOAD_UNKNOWN_VALUE + ALLOCA_G + STORE_UNKNOWN_VALUE + VALUE_ARRAY_NULL_GUARD)
     @Test(valid = ValueTypeArrayFlattenOff, failOn = ALLOC_G + ALLOCA_G + LOAD_UNKNOWN_VALUE + STORE_UNKNOWN_VALUE + VALUE_ARRAY_NULL_GUARD)
     public void test83(Object[] array, Object o) {
         Integer i = (Integer)array[0];