1 files changed, 6 insertions, 1 deletions
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
index fbaa1342c9..147879f5e8 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
@@ -106,7 +106,12 @@ public class StatisticsCounterTest extends TestCase
         Thread.sleep(1500);
         assertEquals(0.0, counter.getPeak());
         counter.registerEvent(2000, start + 1500);
-        Thread.sleep(1000L);
+
+        // make sure, that getPeak invocation occurs at "start + 2500"
+        // if test thread over-sleeps for 500+ mls
+        // the peak value can be incremented and test will fail
+        long sleep = start + 2500 - System.currentTimeMillis();
+        Thread.sleep(sleep < 0 ? 0 : sleep);
         assertEquals(0.0, counter.getPeak());
         counter.registerEvent(1000, start + 500);
         Thread.sleep(1500);