Index: trunk/test/unit/org/openstreetmap/josm/data/notes/NoteCommentTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/notes/NoteCommentTest.java	(revision 17704)
+++ trunk/test/unit/org/openstreetmap/josm/data/notes/NoteCommentTest.java	(revision 17712)
@@ -6,5 +6,5 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Date;
+import java.time.Instant;
 
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -31,5 +31,5 @@
     @Test
     void testNoteComment() {
-        NoteComment comment = new NoteComment(new Date(), null, "foo", null, true);
+        NoteComment comment = new NoteComment(Instant.now(), null, "foo", null, true);
         assertEquals("foo", comment.toString());
         assertTrue(comment.isNew());
Index: trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java	(revision 17704)
+++ trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java	(revision 17712)
@@ -5,5 +5,5 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
-import java.util.Date;
+import java.time.Instant;
 
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -36,5 +36,5 @@
         Note note = new Note(LatLon.ZERO);
         assertEquals("Note 0: null", note.toString());
-        note.addComment(new NoteComment(new Date(), null, "foo", null, true));
+        note.addComment(new NoteComment(Instant.now(), null, "foo", null, true));
         assertEquals("Note 0: foo", note.toString());
     }
@@ -65,6 +65,6 @@
             .withPrefabValues(LatLon.class, LatLon.ZERO, new LatLon(1, 1))
             .withPrefabValues(NoteComment.class,
-                    new NoteComment(new Date(), null, "foo", null, true),
-                    new NoteComment(new Date(), null, "bar", null, false))
+                    new NoteComment(Instant.now(), null, "foo", null, true),
+                    new NoteComment(Instant.now(), null, "bar", null, false))
             .verify();
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/NotesDialogTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/NotesDialogTest.java	(revision 17704)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/NotesDialogTest.java	(revision 17712)
@@ -4,5 +4,5 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.util.Date;
+import java.time.Instant;
 
 import javax.swing.JLabel;
@@ -35,6 +35,6 @@
     void testMultiLineNoteRendering() {
         Note note = new Note(LatLon.ZERO);
-        note.setCreatedAt(new Date());
-        note.addComment(new NoteComment(new Date(), User.createLocalUser(null), "foo\nbar\n\nbaz:\nfoo", null, false));
+        note.setCreatedAt(Instant.now());
+        note.addComment(new NoteComment(Instant.now(), User.createLocalUser(null), "foo\nbar\n\nbaz:\nfoo", null, false));
         assertEquals("0: foo; bar; baz: foo",
                 ((JLabel) new NoteRenderer().getListCellRendererComponent(new JList<>(), note, 0, false, false)).getText());
Index: trunk/test/unit/org/openstreetmap/josm/io/NoteReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/NoteReaderTest.java	(revision 17704)
+++ trunk/test/unit/org/openstreetmap/josm/io/NoteReaderTest.java	(revision 17712)
@@ -64,6 +64,6 @@
         assertEquals(1, list.size());
         Note n = list.get(0);
-        assertEquals(DateUtils.fromString("2013-04-24 08:08:51 UTC"), n.getClosedAt());
-        assertEquals(DateUtils.fromString("2013-04-24 08:07:02 UTC"), n.getCreatedAt());
+        assertEquals(DateUtils.parseInstant("2013-04-24 08:08:51 UTC"), n.getClosedAt());
+        assertEquals(DateUtils.parseInstant("2013-04-24 08:07:02 UTC"), n.getCreatedAt());
         assertEquals(4, n.getId());
         assertEquals(new LatLon(36.7232991, 68.86415), n.getLatLon());
@@ -74,5 +74,5 @@
         NoteComment c1 = comments.get(0);
         assertEquals(c1, n.getFirstComment());
-        assertEquals(DateUtils.fromString("2013-04-24 08:07:02 UTC"), c1.getCommentTimestamp());
+        assertEquals(DateUtils.parseInstant("2013-04-24 08:07:02 UTC"), c1.getCommentTimestamp());
         assertEquals(Action.OPENED, c1.getNoteAction());
         assertEquals("test", c1.getText());
Index: trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java	(revision 17704)
+++ trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java	(revision 17712)
@@ -10,4 +10,6 @@
 
 import java.text.DateFormat;
+import java.time.Instant;
+import java.time.format.FormatStyle;
 import java.util.Date;
 import java.util.Random;
@@ -272,3 +274,23 @@
         assertNotSame(date, DateUtils.cloneDate(date));
     }
+
+    /**
+     * Unit test of {@link DateUtils#getDateTimeFormatter} method.
+     */
+    @Test
+    void testDateTimeFormatter() {
+        Instant instant = Instant.parse("2006-01-02T15:04:05Z");
+        Boolean iso = DateUtils.PROP_ISO_DATES.get();
+        try {
+            assertNotNull(DateUtils.getDateFormatter(FormatStyle.SHORT).format(instant));
+            assertNotNull(DateUtils.getTimeFormatter(FormatStyle.SHORT).format(instant));
+            assertNotNull(DateUtils.getDateTimeFormatter(FormatStyle.SHORT, FormatStyle.SHORT).format(instant));
+            DateUtils.PROP_ISO_DATES.put(!iso);
+            assertNotNull(DateUtils.getDateFormatter(FormatStyle.SHORT).format(instant));
+            assertNotNull(DateUtils.getTimeFormatter(FormatStyle.SHORT).format(instant));
+            assertNotNull(DateUtils.getDateTimeFormatter(FormatStyle.SHORT, FormatStyle.SHORT).format(instant));
+        } finally {
+            DateUtils.PROP_ISO_DATES.put(iso);
+        }
+    }
 }