Index: trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java	(revision 16937)
+++ trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java	(revision 16945)
@@ -128,5 +128,6 @@
         new PostDownloadHandler(null, newFuture("testRunExceptionFuture")).run();
         assertTrue(Logging.getLastErrorAndWarnings().toString(),
-                Logging.getLastErrorAndWarnings().contains("E: java.util.concurrent.ExecutionException: testRunExceptionFuture"));
+                Logging.getLastErrorAndWarnings().stream()
+                        .anyMatch(e -> e.endsWith("E: java.util.concurrent.ExecutionException: testRunExceptionFuture")));
     }
 
@@ -159,5 +160,6 @@
         new PostDownloadHandler(newTask(Arrays.asList("foo", new Exception("bar"), new Object())), newFuture(null)).run();
         assertTrue(Logging.getLastErrorAndWarnings().toString(),
-                Logging.getLastErrorAndWarnings().contains("E: java.lang.Exception: bar"));
+                Logging.getLastErrorAndWarnings().stream()
+                        .anyMatch(e -> e.endsWith("E: java.lang.Exception: bar")));
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/tools/LoggingTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/LoggingTest.java	(revision 16937)
+++ trunk/test/unit/org/openstreetmap/josm/tools/LoggingTest.java	(revision 16945)
@@ -2,5 +2,4 @@
 package org.openstreetmap.josm.tools;
 
-import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -199,5 +198,5 @@
         Consumer<String> test = string -> {
             assertTrue(string.startsWith("java.io.IOException: x"));
-            assertTrue(string.indexOf("testLogWithStackTraceLevelThrowable") >= 0);
+            assertTrue(string.contains("testLogWithStackTraceLevelThrowable"));
         };
         testLogCaptured(Logging.LEVEL_ERROR, test, () -> Logging.logWithStackTrace(Logging.LEVEL_ERROR, new IOException("x")));
@@ -207,5 +206,5 @@
                 () -> Logging.logWithStackTrace(Logging.LEVEL_TRACE, new IOException()));
 
-        testLogCaptured(Logging.LEVEL_TRACE, string -> assertTrue(string.indexOf("Cause:") >= 0),
+        testLogCaptured(Logging.LEVEL_TRACE, string -> assertTrue(string.contains("Cause:")),
                 () -> Logging.logWithStackTrace(Logging.LEVEL_TRACE, new IOException(new IOException())));
 
@@ -268,5 +267,5 @@
 
         assertEquals(1, Logging.getLastErrorAndWarnings().size());
-        assertEquals("W: x", Logging.getLastErrorAndWarnings().get(0));
+        assertTrue(Logging.getLastErrorAndWarnings().toString(), Logging.getLastErrorAndWarnings().get(0).endsWith("W: x"));
 
         Logging.setLogLevel(Logging.LEVEL_ERROR);
@@ -278,5 +277,6 @@
 
         assertEquals(2, Logging.getLastErrorAndWarnings().size());
-        assertArrayEquals(new Object[] {"W: x", "E: y"}, Logging.getLastErrorAndWarnings().toArray());
+        assertTrue(Logging.getLastErrorAndWarnings().toString(), Logging.getLastErrorAndWarnings().get(0).endsWith("W: x"));
+        assertTrue(Logging.getLastErrorAndWarnings().toString(), Logging.getLastErrorAndWarnings().get(1).endsWith("E: y"));
 
         // limit somewhere reasonable
Index: trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java	(revision 16937)
+++ trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java	(revision 16945)
@@ -92,5 +92,5 @@
         assertTrue(cache.isEmpty());
         String error = Logging.getLastErrorAndWarnings().get(0);
-        assertTrue(error, error.startsWith("W: Failed to parse external taginfo data at "));
+        assertTrue(error, error.contains("W: Failed to parse external taginfo data at "));
         assertTrue(error, error.contains(": Invalid token=EOF at (line no=3,"));
     }