diff --git a/gui/src/test/java/io/bisq/gui/util/BSFormatterTest.java b/gui/src/test/java/io/bisq/gui/util/BSFormatterTest.java
index a3720f7670d..c29a9401ce8 100644
--- a/gui/src/test/java/io/bisq/gui/util/BSFormatterTest.java
+++ b/gui/src/test/java/io/bisq/gui/util/BSFormatterTest.java
@@ -51,13 +51,18 @@ public void testIsValid() {
 
     @Test
     public void testFormatDurationAsWords() {
-        assertEquals("1 hour, 0 minutes", formatter.formatDurationAsWords(60 * 60 * 1000));
-        assertEquals("1 day, 0 hours, 0 minutes", formatter.formatDurationAsWords(24 * 60 * 60 * 1000));
-        assertEquals("2 days, 0 hours, 1 minute", formatter.formatDurationAsWords((2 * 24 * 60 + 1) * 60 * 1000));
-        assertEquals("2 days, 0 hours, 2 minutes", formatter.formatDurationAsWords((2 * 24 * 60 + 2) * 60 * 1000));
-        assertEquals("1 hour, 0 minutes, 0 seconds", formatter.formatDurationAsWords(60 * 60 * 1000, true));
-        assertEquals("1 hour, 0 minutes, 1 second", formatter.formatDurationAsWords((60 * 60 + 1) * 1000, true));
-        assertEquals("1 hour, 0 minutes, 2 seconds", formatter.formatDurationAsWords((60 * 60 + 2) * 1000, true));
+        long oneDay = TimeUnit.DAYS.toMillis(1);
+        long oneHour = TimeUnit.HOURS.toMillis(1);
+        long oneMinute = TimeUnit.MINUTES.toMillis(1);
+        long oneSecond = TimeUnit.SECONDS.toMillis(1);
+
+        assertEquals("1 hour, 0 minutes", formatter.formatDurationAsWords(oneHour));
+        assertEquals("1 day, 0 hours, 0 minutes", formatter.formatDurationAsWords(oneDay));
+        assertEquals("2 days, 0 hours, 1 minute", formatter.formatDurationAsWords(oneDay * 2 + oneMinute));
+        assertEquals("2 days, 0 hours, 2 minutes", formatter.formatDurationAsWords(oneDay * 2 + oneMinute * 2));
+        assertEquals("1 hour, 0 minutes, 0 seconds", formatter.formatDurationAsWords(oneHour, true));
+        assertEquals("1 hour, 0 minutes, 1 second", formatter.formatDurationAsWords(oneHour + oneSecond, true));
+        assertEquals("1 hour, 0 minutes, 2 seconds", formatter.formatDurationAsWords(oneHour + oneSecond * 2, true));
         assertEquals("Trade period is over", formatter.formatDurationAsWords(0));
     }
 }