Index: /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/RenderingCLIAreaTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/RenderingCLIAreaTest.java	(revision 19085)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/RenderingCLIAreaTest.java	(revision 19086)
@@ -45,5 +45,5 @@
         // 1
         runs.add(new Object[] {"--scale 4000 --bounds " + param(bFeldberg),
-                CoreMatchers.is(scaleFeldberg4000),
+                isFP(scaleFeldberg4000, ErrorMode.ABSOLUTE, 0.000000000001d),
                 CoreMatchers.is(bFeldberg)});
 
Index: /trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java	(revision 19085)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java	(revision 19086)
@@ -17,4 +17,5 @@
 import java.util.concurrent.ForkJoinPool;
 
+import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -164,6 +165,9 @@
 
         setTimeZone(TimeZone.getTimeZone("Europe/Berlin"));
-        assertEquals("1:00:00" + separator + "AM GMT+01:00", DateUtils.formatTime(new Date(0),
-            DateFormat.LONG), "This is mostly dependent upon java.locale.providers. CET is also OK.");
+        String p1 = "1:00:00" + separator + "AM GMT+01:00";
+        String p2 = "1:00:00" + separator + "AM CET";
+        assertEquals(DateUtils.formatTime(new Date(0), DateFormat.LONG),
+            CoreMatchers.anyOf(CoreMatchers.is(p1), CoreMatchers.is(p2)),
+            "This is mostly dependent upon java.locale.providers.");
     }