diff --git a/test/hotspot/gtest/riscv/test_assembler_riscv.cpp b/test/hotspot/gtest/riscv/test_assembler_riscv.cpp
index 670b873643423..bebfa88815f78 100644
--- a/test/hotspot/gtest/riscv/test_assembler_riscv.cpp
+++ b/test/hotspot/gtest/riscv/test_assembler_riscv.cpp
@@ -47,8 +47,7 @@ class CmovTester {
       _masm.mv(c_rarg0, c_rarg2);
       _masm.ret();
     }
-    _masm.flush();
-    OrderAccess::cross_modify_fence();
+    _masm.flush(); // icache invalidate
     int64_t ret = ((zicond_func)entry)(a0, a1, a2, a3);
     ASSERT_EQ(ret, result);
     BufferBlob::free(bb);
@@ -125,8 +124,7 @@ class NarrowCmpxchgTester {
       _masm.mv(c_rarg0, c_rarg3);
       _masm.ret();
     }
-    _masm.flush();
-    OrderAccess::cross_modify_fence();
+    _masm.flush(); // icache invalidate
     TESTSIZE ret = ((cmpxchg_func)entry)(addr, expected, new_value, result, scratch0, scratch1, scratch2);
     BufferBlob::free(bb);
     return ret;