Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java	(revision 14100)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java	(revision 14101)
@@ -5,9 +5,6 @@
 import static org.junit.Assert.assertTrue;
 
-import java.util.Collections;
-
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.NoteData;
@@ -39,5 +36,5 @@
         try {
             MainApplication.getLayerManager().addLayer(layer);
-            AddNoteAction mapMode = new AddNoteAction(new NoteData(Collections.<Note>emptyList()));
+            AddNoteAction mapMode = new AddNoteAction(new NoteData());
             MapFrame map = MainApplication.getMap();
             MapMode oldMapMode = map.mapMode;
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/NoteDataTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/NoteDataTest.java	(revision 14100)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/NoteDataTest.java	(revision 14101)
@@ -20,5 +20,5 @@
     @Test
     public void testNoteData() {
-        NoteData empty = new NoteData(null);
+        NoteData empty = new NoteData();
         assertEquals(0, empty.getNotes().size());
         NoteData notEmpty = new NoteData(Arrays.asList(new Note(LatLon.ZERO)));
Index: trunk/test/unit/org/openstreetmap/josm/io/OsmChangeReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/OsmChangeReaderTest.java	(revision 14101)
+++ trunk/test/unit/org/openstreetmap/josm/io/OsmChangeReaderTest.java	(revision 14101)
@@ -0,0 +1,70 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.notes.Note;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.NoteData;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Pair;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link OsmChangeReader}.
+ */
+public class OsmChangeReaderTest {
+
+    /**
+     * Setup rule
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Parse osmChange.
+     * @param osm OSM data in osmChange format, without header/footer
+     * @return data set
+     * @throws Exception if any error occurs
+     */
+    private static Pair<DataSet, NoteData> parse(String osm) throws Exception {
+        try (InputStream in = new ByteArrayInputStream((
+                "<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>\n" +
+                "<osmChange generator=\"test\" version=\"0.6\">" + osm + "</osmChange>")
+                .getBytes(StandardCharsets.UTF_8))) {
+            return OsmChangeReader.parseDataSetAndNotes(in, NullProgressMonitor.INSTANCE);
+        }
+    }
+
+    /**
+     * Checks reading of OsmAnd notes.
+     * @throws Exception never
+     */
+    @Test
+    public void testNotes() throws Exception {
+        NoteData nd = parse(
+                "<create>\r\n" +
+                "    <note lat=\"50.23887555404037\" lon=\"13.358299552342795\" id=\"-2\">\r\n" +
+                "      <comment text=\"something\" />\r\n" +
+                "    </note>\r\n" +
+                "  </create>\r\n" +
+                "  <modify />\r\n" +
+                "  <delete />").b;
+        Collection<Note> notes = nd.getNotes();
+        assertEquals(1, notes.size());
+        Note n = notes.iterator().next();
+        assertEquals(new LatLon(50.23887555404037, 13.358299552342795), n.getLatLon());
+        assertEquals("something", n.getFirstComment().getText());
+    }
+}