Index: trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java	(revision 10487)
+++ trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java	(revision 10495)
@@ -35,4 +35,5 @@
     public static void setTimeZone(TimeZone zone) {
         DateUtils.setTimeZone(zone);
+        TimeZone.setDefault(zone);
     }
 
@@ -122,5 +123,5 @@
         assertEquals("12:00 AM", DateUtils.formatTime(new Date(5999), DateFormat.SHORT));
 
-        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
+        setTimeZone(TimeZone.getTimeZone("Europe/Berlin"));
         assertEquals("1:00:00 AM CET", DateUtils.formatTime(new Date(0), DateFormat.LONG));
     }
@@ -156,4 +157,5 @@
 
         // Local time
+        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
         assertEquals(1459688400000L, DateUtils.tsFromString("03-APR-16 15:00:00"));
     }