Index: trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java	(revision 12554)
+++ trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java	(revision 12555)
@@ -59,4 +59,7 @@
     };
 
+    /**
+     * Setup test.
+     */
     @Before
     public void setUp() {
@@ -240,14 +243,21 @@
     }
 
-
+    /**
+     * Checks that a slow request is well handled if it completes before the timeout.
+     * @throws IOException if any I/O error occurs
+     */
     @Test
     public void testRequestInTime() throws IOException {
-        final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/delay/3")).setReadTimeout(3500).connect(progress);
-        assertThat(response.getResponseCode(), is(200));
-    }
-
+        final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/delay/1")).setReadTimeout(1500).connect(progress);
+        assertThat(response.getResponseCode(), is(200));
+    }
+
+    /**
+     * Checks that a slow request results in the expected exception if it exceeds the timeout.
+     * @throws IOException always
+     */
     @Test(expected = IOException.class)
     public void testTakesTooLong() throws IOException {
-        HttpClient.create(new URL("https://httpbin.org/delay/3")).setReadTimeout(2500).connect(progress);
+        HttpClient.create(new URL("https://httpbin.org/delay/1")).setReadTimeout(500).connect(progress);
     }