Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 14078)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 14079)
@@ -18,5 +18,4 @@
 import java.util.List;
 import java.util.Map;
-import java.util.TimeZone;
 
 import javax.swing.ImageIcon;
@@ -238,5 +237,4 @@
     private Marker(LatLon ll, TemplateEngineDataProvider dataProvider, String text, String iconName, MarkerLayer parentLayer,
             double time, double offset) {
-        timeFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
         setCoor(ll);
 
Index: trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java	(revision 14078)
+++ trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java	(revision 14079)
@@ -263,5 +263,7 @@
      */
     public static DateFormat getGpxFormat() {
-        return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        SimpleDateFormat result = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        result.setTimeZone(UTC);
+        return result;
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 14078)
+++ trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 14079)
@@ -29,4 +29,5 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -97,5 +98,5 @@
         }
         System.setProperty("josm.home", josmHome);
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+        TimeZone.setDefault(DateUtils.UTC);
         Config.setPreferencesInstance(Main.pref);
         Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java	(revision 14078)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java	(revision 14079)
@@ -8,5 +8,4 @@
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.TimeZone;
 
 import org.junit.BeforeClass;
@@ -40,5 +39,5 @@
     @BeforeClass
     public static void setUp() {
-        DateUtilsTest.setTimeZone(TimeZone.getTimeZone("UTC"));
+        DateUtilsTest.setTimeZone(DateUtils.UTC);
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/OffsetTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/OffsetTest.java	(revision 14078)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/OffsetTest.java	(revision 14079)
@@ -5,5 +5,4 @@
 
 import java.text.ParseException;
-import java.util.TimeZone;
 
 import org.junit.BeforeClass;
@@ -11,4 +10,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.date.DateUtils;
 import org.openstreetmap.josm.tools.date.DateUtilsTest;
 
@@ -32,5 +32,5 @@
     @BeforeClass
     public static void setUp() {
-        DateUtilsTest.setTimeZone(TimeZone.getTimeZone("UTC"));
+        DateUtilsTest.setTimeZone(DateUtils.UTC);
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/TimezoneTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/TimezoneTest.java	(revision 14078)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/TimezoneTest.java	(revision 14079)
@@ -5,5 +5,4 @@
 
 import java.text.ParseException;
-import java.util.TimeZone;
 
 import org.junit.BeforeClass;
@@ -11,4 +10,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.date.DateUtils;
 import org.openstreetmap.josm.tools.date.DateUtilsTest;
 
@@ -32,5 +32,5 @@
     @BeforeClass
     public static void setUp() {
-        DateUtilsTest.setTimeZone(TimeZone.getTimeZone("UTC"));
+        DateUtilsTest.setTimeZone(DateUtils.UTC);
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java	(revision 14078)
+++ trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java	(revision 14079)
@@ -51,5 +51,5 @@
     @Before
     public void setUp() {
-        iso8601.setTimeZone(TimeZone.getTimeZone("UTC"));
+        iso8601.setTimeZone(DateUtils.UTC);
     }