Index: /trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java	(revision 8390)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java	(revision 8391)
@@ -13,4 +13,5 @@
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.DefaultListSelectionModel;
@@ -655,11 +656,11 @@
         model.addPropertyChangeListener(listener);
 
-        List<PropertyChangeListener> listeners = field("listeners")
-        .ofType(List.class)
+        Set<PropertyChangeListener> listeners = field("listeners")
+        .ofType(Set.class)
         .in(model)
         .get();
 
         assertEquals(1, listeners.size());
-        assertEquals(listener, listeners.get(0));
+        assertEquals(listener, listeners.iterator().next());
     }
 
@@ -678,6 +679,6 @@
         model.removePropertyChangeListener(listener);
 
-        List<PropertyChangeListener> listeners = field("listeners")
-        .ofType(List.class)
+        Set<PropertyChangeListener> listeners = field("listeners")
+        .ofType(Set.class)
         .in(model)
         .get();
Index: /trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java	(revision 8390)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java	(revision 8391)
@@ -9,4 +9,5 @@
 import java.beans.PropertyChangeListener;
 import java.util.List;
+import java.util.Set;
 
 import org.junit.BeforeClass;
@@ -36,10 +37,10 @@
         model.addPropertyChangeListener(listener);
 
-        List<?> list = field("listeners").ofType(List.class)
-        .in(model)
-        .get();
-
-        assertEquals(1, list.size());
-        assertEquals(listener, list.get(0));
+        Set<?> list = field("listeners").ofType(Set.class)
+        .in(model)
+        .get();
+
+        assertEquals(1, list.size());
+        assertEquals(listener, list.iterator().next());
     }
 
@@ -55,6 +56,6 @@
         model.removePropertyChangeListener(listener);
 
-        List<?> list = field("listeners")
-        .ofType(List.class)
+        Set<?> list = field("listeners")
+        .ofType(Set.class)
         .in(model)
         .get();