Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 18437)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 18690)
@@ -16,4 +16,5 @@
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.security.SecureRandom;
 import java.text.MessageFormat;
@@ -52,5 +53,5 @@
  */
 @SuppressFBWarnings(value = "CRLF_INJECTION_LOGS")
-@Timeout(value = 60, unit = TimeUnit.SECONDS)
+@Timeout(value = 1, unit = TimeUnit.MINUTES)
 class MultiFetchServerObjectReaderTest {
     private static final Logger logger = Logger.getLogger(MultiFetchServerObjectReader.class.getName());
@@ -191,5 +192,5 @@
         try (
             PrintWriter pw = new PrintWriter(
-                    new OutputStreamWriter(new FileOutputStream(dataSetCacheOutputFile), StandardCharsets.UTF_8)
+                    new OutputStreamWriter(Files.newOutputStream(dataSetCacheOutputFile.toPath()), StandardCharsets.UTF_8)
         )) {
             logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
Index: trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java	(revision 18437)
+++ trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java	(revision 18690)
@@ -240,5 +240,10 @@
     void testTooMuchRedirects() throws IOException {
         mockRedirects(false, 3);
-        assertThrows(IOException.class, () -> HttpClient.create(url("/relative-redirect/3")).setMaxRedirects(2).connect(progress));
+        final HttpClient client = HttpClient.create(url("/relative-redirect/3")).setMaxRedirects(2);
+        try {
+            assertThrows(IOException.class, () -> client.connect(progress));
+        } finally {
+            client.disconnect();
+        }
     }
 
@@ -370,5 +375,10 @@
     void testTakesTooLong() throws IOException {
         mockDelay(1);
-        assertThrows(IOException.class, () -> HttpClient.create(url("/delay/1")).setReadTimeout(500).connect(progress));
+        final HttpClient client = HttpClient.create(url("/delay/1")).setReadTimeout(500);
+        try {
+            assertThrows(IOException.class, () -> client.connect(progress));
+        } finally {
+            client.disconnect();
+        }
     }
 
@@ -387,5 +397,5 @@
 
     /**
-     * Test of {@link Response#uncompress} method with Gzip compression.
+     * Test of {@link Response#uncompress(boolean)} method with Gzip compression.
      * @throws IOException if any I/O error occurs
      */
@@ -407,5 +417,5 @@
 
     /**
-     * Test of {@link Response#uncompress} method with Bzip compression.
+     * Test of {@link Response#uncompress(boolean)} method with Bzip compression.
      * @throws IOException if any I/O error occurs
      */
@@ -427,5 +437,5 @@
 
     /**
-     * Test of {@link Response#uncompress} method with Bzip compression.
+     * Test of {@link Response#uncompress(boolean)} method with Bzip compression.
      * @throws IOException if any I/O error occurs
      */