Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java	(revision 12763)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java	(revision 12764)
@@ -166,4 +166,17 @@
     @Test
     public void testFireingEventsUpdateChangeset() {
+        // Waiter listener to ensure the second listener does not receive the first event
+        TestListener waiter = new TestListener() {
+            @Override
+            void test() {
+                await();
+            }
+        };
+        cache.addChangesetCacheListener(waiter);
+        Changeset cs = new Changeset(1);
+        cache.update(cs);
+        waiter.test();
+        cache.removeChangesetCacheListener(waiter);
+
         TestListener listener = new TestListener() {
             @Override
@@ -177,7 +190,4 @@
             }
         };
-        Changeset cs = new Changeset(1);
-        cache.update(cs);
-
         cache.addChangesetCacheListener(listener);
         cache.update(cs);