Index: trunk/test/unit/org/openstreetmap/josm/testutils/MapModeUtils.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/testutils/MapModeUtils.java	(revision 19262)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/MapModeUtils.java	(revision 19270)
@@ -5,4 +5,5 @@
 
 import java.awt.event.MouseEvent;
+import java.util.concurrent.TimeUnit;
 
 import org.awaitility.Awaitility;
@@ -81,5 +82,5 @@
         MainApplication.getMap().mapMode.mousePressed(mouseClickAt(from));
         // Some actions wait a period of time to avoid accidental dragging.
-        Awaitility.await().pollDelay(Durations.FIVE_HUNDRED_MILLISECONDS).atLeast(Durations.FIVE_HUNDRED_MILLISECONDS).until(() -> true);
+        Awaitility.await().pollDelay(Durations.FIVE_HUNDRED_MILLISECONDS).atLeast(490, TimeUnit.MILLISECONDS).until(() -> true);
         MainApplication.getMap().mapMode.mouseDragged(mouseClickAt(from));
         MainApplication.getMap().mapMode.mouseDragged(mouseClickAt(to));