Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java	(revision 15398)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java	(revision 15399)
@@ -11,10 +11,8 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.TimeZone;
 
 import javax.swing.JScrollPane;
 
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -44,13 +42,4 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().main().projection().i18n();
-
-    /**
-     * Setup test
-     */
-    @Before
-    public void before() {
-        // Make sure we don't rely on a specific country, for distance units
-        Locale.setDefault(Locale.ENGLISH);
-    }
 
     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 15398)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 15399)
@@ -34,4 +34,5 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.UserIdentityManager;
 import org.openstreetmap.josm.data.Version;
@@ -500,4 +501,7 @@
         }
 
+        // Make sure we're using the metric system
+        SystemOfMeasurement.setSystemOfMeasurement(SystemOfMeasurement.METRIC.getName());
+
         if (useHttps) {
             try {