--- old/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatRateTest.java	2018-03-28 08:20:29.141184826 -0700
+++ new/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatRateTest.java	2018-03-28 08:20:28.825185983 -0700
@@ -38,18 +38,18 @@
   public static void main(String[] args) {
     int[] tab = {1024, 16384, 524288};
 
-    HeapMonitor.enableSamplingEvents();
-
     for (int rateIdx = 0; rateIdx < tab.length; rateIdx++) {
       int rate = tab[rateIdx];
 
       HeapMonitor.resetEventStorage();
       HeapMonitor.setSamplingRate(rate);
 
+      HeapMonitor.enableSamplingEvents();
+
       int allocationTotal = 512 * 1024 * 1024;
       HeapMonitor.allocateSize(allocationTotal);
 
-      HeapMonitor.setSamplingRate(0);
+      HeapMonitor.disableSamplingEvents();
 
       double actualCount = HeapMonitor.getEventStorageElementCount();
       double expectedCount = allocationTotal / rate;