Index: trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java	(revision 17199)
+++ trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java	(revision 17211)
@@ -13,4 +13,5 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.text.IsEqualIgnoringCase.equalToIgnoringCase;
@@ -23,4 +24,7 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.Map;
@@ -30,5 +34,4 @@
 import java.util.stream.Collectors;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -339,5 +342,6 @@
     @Test
     public void testOpenUrlGzip() throws IOException {
-        final byte[] gpx = Utils.readBytesFromStream(getClass().getClassLoader().getResourceAsStream("tracks/tracks.gpx.gz"));
+        final Path path = Paths.get(TestUtils.getTestDataRoot(), "tracks/tracks.gpx.gz");
+        final byte[] gpx = Files.readAllBytes(path);
         localServer.stubFor(get(urlEqualTo("/trace/1613906/data"))
                 .willReturn(aResponse()
@@ -348,5 +352,5 @@
         final URL url = new URL(localServer.url("/trace/1613906/data"));
         try (BufferedReader x = HttpClient.create(url).connect().uncompress(true).getContentReader()) {
-            Assert.assertTrue(x.readLine().startsWith("<?xml version="));
+            assertThat(x.readLine(), startsWith("<?xml version="));
         }
     }
@@ -358,5 +362,6 @@
     @Test
     public void testOpenUrlBzip() throws IOException {
-        final byte[] gpx = Utils.readBytesFromStream(getClass().getClassLoader().getResourceAsStream("tracks/tracks.gpx.bz2"));
+        final Path path = Paths.get(TestUtils.getTestDataRoot(), "tracks/tracks.gpx.bz2");
+        final byte[] gpx = Files.readAllBytes(path);
         localServer.stubFor(get(urlEqualTo("/trace/785544/data"))
                 .willReturn(aResponse()
@@ -367,5 +372,5 @@
         final URL url = new URL(localServer.url("/trace/785544/data"));
         try (BufferedReader x = HttpClient.create(url).connect().uncompress(true).getContentReader()) {
-            Assert.assertTrue(x.readLine().startsWith("<?xml version="));
+            assertThat(x.readLine(), startsWith("<?xml version="));
         }
     }
@@ -377,5 +382,6 @@
     @Test
     public void testOpenUrlBzipAccordingToContentDisposition() throws IOException {
-        final byte[] gpx = Utils.readBytesFromStream(getClass().getClassLoader().getResourceAsStream("tracks/tracks.gpx.bz2"));
+        final Path path = Paths.get(TestUtils.getTestDataRoot(), "tracks/tracks.gpx.bz2");
+        final byte[] gpx = Files.readAllBytes(path);
         localServer.stubFor(get(urlEqualTo("/trace/1350010/data"))
                 .willReturn(aResponse()
@@ -388,5 +394,5 @@
         try (BufferedReader x = HttpClient.create(url).connect()
                 .uncompress(true).uncompressAccordingToContentDisposition(true).getContentReader()) {
-            Assert.assertTrue(x.readLine().startsWith("<?xml version="));
+            assertThat(x.readLine(), startsWith("<?xml version="));
         }
     }