Index: /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java	(revision 7086)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java	(revision 7087)
@@ -6,4 +6,5 @@
 import javax.swing.JFrame;
 
+import org.junit.Ignore;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
@@ -11,4 +12,5 @@
 import org.openstreetmap.josm.data.osm.Way;
 
+@Ignore
 public class NodeListMergerTest extends JFrame {
 
Index: /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java	(revision 7086)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java	(revision 7087)
@@ -6,4 +6,5 @@
 import javax.swing.JFrame;
 
+import org.junit.Ignore;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -13,4 +14,5 @@
 import org.openstreetmap.josm.data.projection.Projections;
 
+@Ignore
 public class PropertiesMergerTest extends JFrame{
 
Index: /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java	(revision 7086)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java	(revision 7087)
@@ -6,4 +6,5 @@
 import javax.swing.JFrame;
 
+import org.junit.Ignore;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
@@ -13,4 +14,5 @@
 import org.openstreetmap.josm.data.osm.Way;
 
+@Ignore
 public class RelationMemberMergerTest extends JFrame {
 
Index: /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java	(revision 7086)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java	(revision 7087)
@@ -1,4 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.pair.tags;
+
+import org.junit.Ignore;
 
 import java.awt.BorderLayout;
@@ -6,4 +8,5 @@
 import javax.swing.JFrame;
 
+@Ignore
 public class TagMergerTest extends JFrame {
 
Index: /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 7086)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 7087)
@@ -4,4 +4,5 @@
 import javax.swing.JFrame;
 
+import org.junit.Ignore;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
@@ -9,4 +10,5 @@
 import org.openstreetmap.josm.data.osm.Way;
 
+@Ignore
 public class ConflictResolutionDialogTest extends JFrame {
 
Index: /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java	(revision 7086)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java	(revision 7087)
@@ -2,6 +2,9 @@
 package org.openstreetmap.josm.gui.dialogs.changeset;
 
+import org.junit.Ignore;
+
 import javax.swing.JFrame;
 
+@Ignore
 public class ChangesetCacheManagerTest extends JFrame {
 
Index: /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java	(revision 7086)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java	(revision 7087)
@@ -2,6 +2,9 @@
 package org.openstreetmap.josm.gui.dialogs.changeset.query;
 
+import org.junit.Ignore;
+
 import javax.swing.JFrame;
 
+@Ignore
 public class ChangesetQueryDialogTest extends JFrame {
 
Index: /trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java	(revision 7086)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java	(revision 7087)
@@ -8,4 +8,5 @@
 
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
@@ -18,4 +19,5 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 
+@Ignore
 public class HistoryBrowserTest extends JFrame {
 
Index: /trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy	(revision 7086)
+++ /trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy	(revision 7087)
@@ -18,5 +18,5 @@
 class OsmChangesetContentParserTest {
 	final shouldFail = new GroovyTestCase().&shouldFail
-	
+
 	@Test
 	public void test_Constructor() {
@@ -25,8 +25,12 @@
 		// should be OK 
 		parser = new OsmChangesetContentParser(new ByteArrayInputStream("".bytes))
-		
-		shouldFail(IllegalArgumentException) {
-			parser = new OsmChangesetContentParser(null)
-		}
+
+        shouldFail(IllegalArgumentException) {
+            parser = new OsmChangesetContentParser((String) null)
+        }
+
+        shouldFail(IllegalArgumentException) {
+            parser = new OsmChangesetContentParser((InputStream) null)
+        }
 	}