diff --git a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortRatio.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortRatio.java
index 18cdcd6dca02c4ea16995ace35c6b9b1232e3321..672e0f9ab703a4ac41aee24fc3b95429d42b50bd 100644
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortRatio.java
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortRatio.java
@@ -136,7 +136,7 @@ public class TestRTMAbortRatio {
         public void lock(boolean abort) {
             synchronized(monitor) {
                 if (abort) {
-                    Test.UNSAFE.addressSize();
+                    Test.UNSAFE.pageSize();
                 }
             }
         }
diff --git a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
index 3abc7fdb2a637fdc54b0da6ac068365617a20f1d..f8a0c7b994c09b3d14679ce2e3178d1be798f41c 100644
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
@@ -167,7 +167,7 @@ public class TestRTMAfterNonRTMDeopt {
                 synchronized(monitor) {
                     a[0]++;
                     if (abort) {
-                        Test.field = Test.UNSAFE.addressSize();
+                        Test.field = Test.UNSAFE.pageSize();
                     }
                 }
             } catch (Throwable t) {
diff --git a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
index 6955f125b03d10883341e2b27cee03a2d1a26e61..944e7a988902c139dc26a0356e134ec497bf7f69 100644
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
@@ -140,7 +140,7 @@ public class TestRTMDeoptOnLowAbortRatio {
         public void forceAbort(boolean abort) {
             synchronized(monitor) {
                 if (abort) {
-                    Test.UNSAFE.addressSize();
+                    Test.UNSAFE.pageSize();
                 }
             }
         }
diff --git a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingThreshold.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingThreshold.java
index 959805a52d81842ba67a6ed561d8b6b546948f61..626c840545e0d0103c6d1dd037f2b57387f8b430 100644
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingThreshold.java
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingThreshold.java
@@ -151,7 +151,7 @@ public class TestRTMLockingThreshold {
         public void lock(boolean abort) {
             synchronized(monitor) {
                 if (abort) {
-                    Test.field += Test.UNSAFE.addressSize();
+                    Test.field += Test.UNSAFE.pageSize();
                 }
             }
         }
diff --git a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
index 703d46caed12db318b82ec7c62832a385fd5511b..f25517a759cfc6a7ab46591476553875844eb4c5 100644
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
@@ -129,7 +129,7 @@ public class TestRTMTotalCountIncrRate {
                     // If an actual JNI call will be replaced by
                     // intrinsic - we'll be in trouble, since xabort
                     // will be no longer called and test may fail.
-                    UNSAFE.addressSize();
+                    UNSAFE.pageSize();
                 }
                 Test.field++;
             }
diff --git a/test/hotspot/jtreg/compiler/testlibrary/rtm/XAbortProvoker.java b/test/hotspot/jtreg/compiler/testlibrary/rtm/XAbortProvoker.java
index 961ff33eecae33b09b704c6a0831647c3f588aeb..06bd7884548291349d2d71b30e051b513a639eac 100644
--- a/test/hotspot/jtreg/compiler/testlibrary/rtm/XAbortProvoker.java
+++ b/test/hotspot/jtreg/compiler/testlibrary/rtm/XAbortProvoker.java
@@ -46,7 +46,7 @@ class XAbortProvoker extends AbortProvoker {
     @Override
     public void forceAbort() {
         synchronized(monitor) {
-            XAbortProvoker.field = UNSAFE.addressSize();
+            XAbortProvoker.field = UNSAFE.pageSize();
         }
     }
 
@@ -54,7 +54,7 @@ class XAbortProvoker extends AbortProvoker {
     public String[] getMethodsToCompileNames() {
         return new String[] {
                 getMethodWithLockName(),
-                Unsafe.class.getName() + "::addressSize"
+                Unsafe.class.getName() + "::pageSize"
         };
     }
 }