Index: trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java	(revision 10510)
+++ trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java	(revision 10513)
@@ -15,5 +15,4 @@
 import java.util.TimeZone;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -23,5 +22,4 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.date.DateUtils;
-import org.openstreetmap.josm.tools.date.DateUtilsTest;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -37,5 +35,5 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    public JOSMTestRules test = new JOSMTestRules().timeout(60000);
 
     private File orientationSampleFile, directionSampleFile;
@@ -48,13 +46,4 @@
         directionSampleFile = new File("data_nodist/exif-example_direction.jpg");
         orientationSampleFile = new File("data_nodist/exif-example_orientation=6.jpg");
-        DateUtilsTest.setTimeZone(TimeZone.getTimeZone("Europe/Berlin"));
-    }
-
-    /**
-     * Clean {@link DateUtils} state
-     */
-    @After
-    public void done() {
-        DateUtilsTest.setTimeZone(DateUtils.UTC);
     }
 
@@ -66,4 +55,9 @@
     public void testReadTime() throws ParseException {
         Date date = ExifReader.readTime(directionSampleFile);
+        assertEquals(new GregorianCalendar(2010, Calendar.MAY, 15, 17, 12, 05).getTime(), date);
+
+        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
+        date = ExifReader.readTime(directionSampleFile);
+        TimeZone.setDefault(DateUtils.UTC);
         assertEquals(new GregorianCalendar(2010, Calendar.MAY, 15, 15, 12, 05).getTime(), date);
     }
@@ -77,4 +71,10 @@
         Date date = ExifReader.readTime(new File("data_nodist/IMG_20150711_193419.jpg"));
         String dateStr = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").format(date);
+        assertEquals("2015-07-11T19:34:19.100", dateStr);
+
+        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
+        date = ExifReader.readTime(new File("data_nodist/IMG_20150711_193419.jpg"));
+        TimeZone.setDefault(DateUtils.UTC);
+        dateStr = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").format(date);
         assertEquals("2015-07-11T17:34:19.100", dateStr);
     }
@@ -117,5 +117,5 @@
         File file = new File(TestUtils.getRegressionDataFile(11685, "2015-11-08_15-33-27-Xiaomi_YI-Y0030832.jpg"));
         String dateStr = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").format(ExifReader.readTime(file));
-        assertEquals("2015-11-08T14:33:27.500", dateStr);
+        assertEquals("2015-11-08T15:33:27.500", dateStr);
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java	(revision 10510)
+++ trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java	(revision 10513)
@@ -13,4 +13,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 /**
@@ -18,4 +19,8 @@
  */
 public class UtilsTest {
+    /**
+     * Use default, basic test rules.
+     */
+    public JOSMTestRules rules = new JOSMTestRules();
 
     /**
Index: trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java	(revision 10510)
+++ trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java	(revision 10513)
@@ -34,5 +34,4 @@
      */
     public static void setTimeZone(TimeZone zone) {
-        DateUtils.setTimeZone(zone);
         TimeZone.setDefault(zone);
     }