Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java	(revision 15399)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java	(revision 15400)
@@ -41,5 +41,5 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().main().projection().i18n();
+    public JOSMTestRules test = new JOSMTestRules().main().projection().i18n().metricSystem();
 
     private static String getHtml(GpxLayer layer) {
Index: trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 15399)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 15400)
@@ -101,4 +101,5 @@
     private boolean territories;
     private boolean rlTraffic;
+    private boolean metric;
     private boolean main;
 
@@ -283,4 +284,14 @@
         territories();
         rlTraffic = true;
+        return this;
+    }
+
+    /**
+     * Force metric measurement system.
+     * @return this instance, for easy chaining
+     * @since 15400
+     */
+    public JOSMTestRules metricSystem() {
+        metric = true;
         return this;
     }
@@ -502,5 +513,7 @@
 
         // Make sure we're using the metric system
-        SystemOfMeasurement.setSystemOfMeasurement(SystemOfMeasurement.METRIC.getName());
+        if (metric) {
+            SystemOfMeasurement.setSystemOfMeasurement(SystemOfMeasurement.METRIC.getName());
+        }
 
         if (useHttps) {