diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestRematerializeObjects.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestRematerializeObjects.java
index d2fdf47b060ef..6e9a6d65d502f 100644
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestRematerializeObjects.java
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestRematerializeObjects.java
@@ -77,12 +77,12 @@ public void runTest1() {
     @Test
     @IR(counts = {IRNode.ALLOC_ARRAY, "1",
                   IRNode.UNSTABLE_IF_TRAP, "1",
-                  IRNode.STORE_L_OF_CLASS, "int\\[int:4\\]", "1",
+                  IRNode.STORE_L, ">0",
                   IRNode.SAFEPOINT_SCALAROBJECT_OF, "fields@\\[0..3\\]", "0"},
         applyIfAnd = {"EliminateAllocations", "false", "UseUnalignedAccesses", "true"})
     @IR(counts = {IRNode.ALLOC_ARRAY, "0",
                   IRNode.UNSTABLE_IF_TRAP, "1",
-                  IRNode.STORE_L_OF_CLASS, "int\\[int:4\\]", "0",
+                  IRNode.STORE_L, "0",
                   IRNode.SAFEPOINT_SCALAROBJECT_OF, "fields@\\[0..3\\]", "2"},
         applyIfAnd = {"EliminateAllocations", "true", "UseUnalignedAccesses", "true"})
     static int test1(boolean flag) {
@@ -122,12 +122,12 @@ public void runTest2() {
     @Test
     @IR(counts = {IRNode.ALLOC_ARRAY, "1",
                   IRNode.UNSTABLE_IF_TRAP, "1",
-                  IRNode.STORE_I_OF_CLASS, "short\\[int:4\\]", "1",
+                  IRNode.STORE_I, ">0",
                   IRNode.SAFEPOINT_SCALAROBJECT_OF, "fields@\\[0..3\\]", "0"},
         applyIfAnd = {"EliminateAllocations", "false", "UseUnalignedAccesses", "true"})
     @IR(counts = {IRNode.ALLOC_ARRAY, "0",
                   IRNode.UNSTABLE_IF_TRAP, "1",
-                  IRNode.STORE_I_OF_CLASS, "short\\[int:4\\]", "0",
+                  IRNode.STORE_I, "0",
                   IRNode.SAFEPOINT_SCALAROBJECT_OF, "fields@\\[0..3\\]", "2"},
         applyIfAnd = {"EliminateAllocations", "true", "UseUnalignedAccesses", "true"})
     static int test2(boolean flag) {