Index: /trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java	(revision 19427)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java	(revision 19428)
@@ -6,4 +6,5 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -100,9 +101,7 @@
     void testActionPerformedDisabled() {
         assertTrue(MainApplication.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
-        try {
-            new AddImageryLayerAction(new ImageryInfo("foo")).actionPerformed(null);
-        } catch (IllegalArgumentException expected) {
-            assertEquals("Parameter 'info.url' must not be null", expected.getMessage());
-        }
+        final AddImageryLayerAction action = new AddImageryLayerAction(new ImageryInfo("foo"));
+        IllegalArgumentException expected = assertThrows(IllegalArgumentException.class, () -> action.actionPerformed(null));
+        assertEquals("Parameter 'info.url' must not be null", expected.getMessage());
         assertTrue(MainApplication.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
     }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java	(revision 19427)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java	(revision 19428)
@@ -33,4 +33,5 @@
 import org.openstreetmap.josm.testutils.annotations.MapPaintStyles;
 import org.openstreetmap.josm.testutils.annotations.Projection;
+import org.openstreetmap.josm.testutils.annotations.Territories;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
@@ -43,4 +44,5 @@
 @MapPaintStyles
 @Projection
+@Territories(Territories.Initialize.ALL)
 class CreateMultipolygonActionTest {
     private static Map<String, String> getRefToRoleMap(Relation relation) {
Index: /trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java	(revision 19427)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java	(revision 19428)
@@ -38,4 +38,5 @@
 import org.openstreetmap.josm.testutils.annotations.Main;
 import org.openstreetmap.josm.testutils.annotations.Projection;
+import org.openstreetmap.josm.testutils.annotations.Territories;
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Utils;
@@ -47,4 +48,5 @@
 @Main
 @Projection
+@Territories
 class JoinAreasActionTest {
     /**
Index: /trunk/test/unit/org/openstreetmap/josm/actions/JoinNodeWayActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/JoinNodeWayActionTest.java	(revision 19427)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/JoinNodeWayActionTest.java	(revision 19428)
@@ -29,4 +29,5 @@
 import org.openstreetmap.josm.testutils.annotations.Main;
 import org.openstreetmap.josm.testutils.annotations.Projection;
+import org.openstreetmap.josm.testutils.annotations.Territories;
 import org.openstreetmap.josm.tools.Geometry;
 
@@ -37,4 +38,5 @@
 @Main
 @Projection
+@Territories(Territories.Initialize.ALL)
 final class JoinNodeWayActionTest {
     private void setupMapView(DataSet ds) {
Index: /trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java	(revision 19427)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java	(revision 19428)
@@ -4,4 +4,5 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -81,11 +82,5 @@
     void testDecide1() {
         TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
-        try {
-            item.decide(null);
-            fail("expected IllegalArgumentException not thrown");
-        } catch (IllegalArgumentException e) {
-            // OK
-            Logging.trace(e);
-        }
+        assertThrows(IllegalArgumentException.class, () -> item.decide(null));
     }
 
@@ -128,11 +123,5 @@
         Node n1 = new Node(1);
         n1.put("key", "oldvalue");
-        try {
-            item.applyToMyPrimitive(n1);
-            fail("expected IllegalStateException");
-        } catch (IllegalStateException e) {
-            // OK
-            Logging.trace(e);
-        }
+        assertThrows(IllegalStateException.class, () -> item.applyToMyPrimitive(n1));
     }
 
@@ -141,11 +130,5 @@
         TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
 
-        try {
-            item.applyToMyPrimitive(null);
-            fail("expected IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // OK
-            Logging.trace(e);
-        }
+        assertThrows(IllegalArgumentException.class, () -> item.applyToMyPrimitive(null));
     }
 }