Index: test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
===================================================================
--- test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 284)
+++ test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 285)
@@ -350,13 +350,3 @@
 		assertEquals(23, ds.segments.iterator().next().id);
 	}
-	
-	public void testDoNotMergeEqualObjectsWithDifferentNonZeroId() throws Exception {
-		DataSet ds = new DataSet();
-		Segment s1 = createSegment(ds, false, false, 23);
-		Segment s2 = new Segment(s1);
-		s2.id = 42;
-		MergeVisitor v = new MergeVisitor(ds, null);
-		v.visit(s2);
-		assertEquals(2, ds.segments.size());
-	}
 }
Index: test/unit/org/openstreetmap/josm/testframework/MotherObject.java
===================================================================
--- test/unit/org/openstreetmap/josm/testframework/MotherObject.java	(revision 284)
+++ test/unit/org/openstreetmap/josm/testframework/MotherObject.java	(revision 285)
@@ -23,4 +23,5 @@
 	    super.setUp();
 	    Main.proj = new Epsg4326();
+	    Main.ds = new DataSet();
     }