Index: trunk/test/unit/org/openstreetmap/josm/data/AutosaveTaskTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/AutosaveTaskTest.java	(revision 11033)
+++ trunk/test/unit/org/openstreetmap/josm/data/AutosaveTaskTest.java	(revision 11035)
@@ -14,5 +14,6 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Calendar;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
 import java.util.List;
@@ -87,8 +88,5 @@
         Files.createDirectories(task.getAutosaveDir());
         AutosaveLayerInfo info = new AutosaveLayerInfo(new OsmDataLayer(new DataSet(), "layer", null));
-        Calendar cal = Calendar.getInstance();
-        cal.set(2016, 0, 1, 1, 2, 3);
-        cal.set(Calendar.MILLISECOND, 456);
-        Date fixed = cal.getTime();
+        Date fixed = Date.from(ZonedDateTime.of(2016, 1, 1, 1, 2, 3, 456_000_000, ZoneId.systemDefault()).toInstant());
 
         AutosaveTask.PROP_INDEX_LIMIT.put(5);
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 11033)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 11035)
@@ -11,8 +11,7 @@
 
 import java.io.StringWriter;
+import java.time.Instant;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 
 import org.junit.After;
@@ -26,5 +25,4 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * Unit tests for class {@link DataSetMerger}.
@@ -298,5 +296,4 @@
     public void testNodeSimpleNoIdSemanticallyEqual() {
 
-        Calendar cal = GregorianCalendar.getInstance();
         User myUser = User.createOsmUser(1111, "my");
 
@@ -307,5 +304,5 @@
         n.put("key1", "value1");
         n.setUser(myUser);
-        n.setTimestamp(cal.getTime());
+        n.setTimestamp(new Date());
 
         my.addPrimitive(n);
@@ -314,7 +311,5 @@
         n1.setCoor(LatLon.ZERO);
         n1.put("key1", "value1");
-        cal.add(Calendar.HOUR, 1);
-        Date timestamp = cal.getTime();
-        n1.setTimestamp(timestamp);
+        n1.setTimestamp(Date.from(Instant.now().plusSeconds(3600)));
         n1.setUser(theirUser);
         their.addPrimitive(n1);
Index: trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy	(revision 11033)
+++ trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy	(revision 11035)
@@ -1,6 +1,4 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io;
-
-import static org.junit.Assert.*
+package org.openstreetmap.josm.io
 
 import org.junit.Test
@@ -8,4 +6,7 @@
 import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlParser
 
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+
 class ChangesetQueryUrlParserTest {
     final shouldFail = new GroovyTestCase().&shouldFail
@@ -127,12 +128,6 @@
         assert q != null
         assert q.@closedAfter != null
-        Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("GMT+0"));
-        cal.setTime(q.@closedAfter);
-        assert cal.get(Calendar.YEAR) == 2009
-        assert cal.get(Calendar.MONTH) == 11 // calendar is 0-based
-        assert cal.get(Calendar.DAY_OF_MONTH) == 25
-        assert cal.get(Calendar.HOUR_OF_DAY) == 10
-        assert cal.get(Calendar.MINUTE) == 0
-        assert cal.get(Calendar.SECOND) == 0
+        def cal = q.@closedAfter.toInstant().atOffset(ZoneOffset.UTC)
+        assert cal == OffsetDateTime.of(2009, 12, 25, 10, 0, 0, 0, ZoneOffset.UTC)
 
         // OK
Index: trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java	(revision 11033)
+++ trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java	(revision 11035)
@@ -10,7 +10,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
@@ -24,5 +24,4 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * EXIF metadata extraction test
@@ -55,10 +54,11 @@
     public void testReadTime() throws ParseException {
         Date date = ExifReader.readTime(directionSampleFile);
-        assertEquals(new GregorianCalendar(2010, Calendar.MAY, 15, 17, 12, 05).getTime(), date);
+        assertEquals(ZonedDateTime.of(2010, 5, 15, 17, 12, 5, 0, ZoneId.systemDefault()).toInstant(), date.toInstant());
 
-        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
+        final TimeZone zone = TimeZone.getTimeZone("Europe/Berlin");
+        TimeZone.setDefault(zone);
         date = ExifReader.readTime(directionSampleFile);
         TimeZone.setDefault(DateUtils.UTC);
-        assertEquals(new GregorianCalendar(2010, Calendar.MAY, 15, 15, 12, 05).getTime(), date);
+        assertEquals(ZonedDateTime.of(2010, 5, 15, 17, 12, 5, 0, zone.toZoneId()).toInstant(), date.toInstant());
     }