Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 2982)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 2990)
@@ -3,5 +3,5 @@
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
@@ -14,5 +14,5 @@
 
     @Test
-    public void HistoryWayTest() {
+    public void wayTest() {
         Date d = new Date();
         HistoryWay way = new HistoryWay(
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java	(revision 2982)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java	(revision 2990)
@@ -729,5 +729,5 @@
                 events.add(evt);
             }
-        };
+        }
         MyListener listener = new MyListener();
         model.addPropertyChangeListener(listener);
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java	(revision 2982)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java	(revision 2990)
@@ -16,4 +16,5 @@
 import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeModel;
 
+@SuppressWarnings("unchecked")
 public class TagMergeModelTest {