Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 12749)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 12750)
@@ -45,5 +45,4 @@
     @Before
     public void setUp() {
-        User.clearUserMap();
         my = new DataSet();
         my.setVersion("0.6");
Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/UserTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/UserTest.java	(revision 12749)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/UserTest.java	(revision 12750)
@@ -29,18 +29,14 @@
     @Test
     public void testCreateOsmUser() {
-        try {
-            User user1 = User.createOsmUser(1, "name1");
-            assertEquals(1, user1.getId());
-            assertEquals("name1", user1.getName());
-            User user2 = User.createOsmUser(1, "name2");
-            assertSame(user1, user2);
-            assertEquals(1, user2.getId());
-            assertEquals("name2", user2.getName());
-            assertEquals(2, user2.getNames().size());
-            assertTrue(user2.getNames().contains("name1"));
-            assertTrue(user2.getNames().contains("name2"));
-        } finally {
-            User.clearUserMap();
-        }
+        User user1 = User.createOsmUser(1, "name1");
+        assertEquals(1, user1.getId());
+        assertEquals("name1", user1.getName());
+        User user2 = User.createOsmUser(1, "name2");
+        assertSame(user1, user2);
+        assertEquals(1, user2.getId());
+        assertEquals("name2", user2.getName());
+        assertEquals(2, user2.getNames().size());
+        assertTrue(user2.getNames().contains("name1"));
+        assertTrue(user2.getNames().contains("name2"));
     }
 }
Index: /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 12749)
+++ /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 12750)
@@ -16,4 +16,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.UserIdentityManager;
+import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.data.projection.Projections;
@@ -267,4 +268,5 @@
         // Assume anonymous user
         UserIdentityManager.getInstance().setAnonymous();
+        User.clearUserMap();
 
         // Set up i18n