Index: trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java	(revision 9669)
+++ trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java	(revision 9671)
@@ -43,16 +43,22 @@
         try (InputStream is = TestUtils.getRegressionDataStream(12038, "data.osm")) {
             DataSet ds = OsmReader.parseDataSet(is, null);
-            Main.map.mapView.addLayer(new OsmDataLayer(ds, null, null));
-            for (Way w : ds.getWays()) {
-                if (w.getId() == 222191929L) {
-                    ds.addSelected(w);
+            OsmDataLayer layer = new OsmDataLayer(ds, null, null);
+            Main.main.addLayer(layer);
+            try {
+                for (Way w : ds.getWays()) {
+                    if (w.getId() == 222191929L) {
+                        ds.addSelected(w);
+                    }
                 }
-            }
-            new PurgeAction().actionPerformed(null);
-            for (Way w : ds.getWays()) {
-                if (w.getId() == 222191929L) {
-                    assertTrue(w.isIncomplete());
-                    assertEquals(0, w.getNodesCount());
+                new PurgeAction().actionPerformed(null);
+                for (Way w : ds.getWays()) {
+                    if (w.getId() == 222191929L) {
+                        assertTrue(w.isIncomplete());
+                        assertEquals(0, w.getNodesCount());
+                    }
                 }
+            } finally {
+                // Ensure we clean the place before leaving, even if test fails.
+                Main.main.removeLayer(layer);
             }
         }
Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java	(revision 9669)
+++ trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java	(revision 9671)
@@ -5,7 +5,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
 
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -18,8 +17,13 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
+
 /**
  * Unit tests of {@link ConflictAddCommand} class.
  */
 public class ConflictAddCommandTest {
+
+    private static OsmDataLayer layer;
 
     /**
@@ -29,5 +33,14 @@
     public static void setUpBeforeClass() {
         JOSMFixture.createUnitTestFixture().init(true);
-        Main.map.mapView.addLayer(new OsmDataLayer(new DataSet(), null, null));
+        layer = new OsmDataLayer(new DataSet(), null, null);
+        Main.main.addLayer(layer);
+    }
+
+    /**
+     * Cleanup test resources.
+     */
+    @AfterClass
+    public static void tearDownAfterClass() {
+        Main.main.removeLayer(layer);
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java	(revision 9669)
+++ trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java	(revision 9671)
@@ -5,7 +5,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
 
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -20,8 +19,13 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
+
 /**
  * Unit tests of {@link CoordinateConflictResolveCommand} class.
  */
 public class CoordinateConflictResolveCommandTest {
+
+    private static OsmDataLayer layer;
 
     /**
@@ -31,5 +35,14 @@
     public static void setUpBeforeClass() {
         JOSMFixture.createUnitTestFixture().init(true);
-        Main.map.mapView.addLayer(new OsmDataLayer(new DataSet(), null, null));
+        layer = new OsmDataLayer(new DataSet(), null, null);
+        Main.main.addLayer(layer);
+    }
+
+    /**
+     * Cleanup test resources.
+     */
+    @AfterClass
+    public static void tearDownAfterClass() {
+        Main.main.removeLayer(layer);
     }