Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/PreferencesTestUtils.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/preferences/PreferencesTestUtils.java	(revision 16978)
+++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/PreferencesTestUtils.java	(revision 16979)
@@ -20,15 +20,4 @@
     public static void doTestPreferenceSettingAddGui(
             PreferenceSettingFactory factory, Class<? extends DefaultTabPreferenceSetting> parentClass) {
-        doTestPreferenceSettingAddGui(factory, parentClass, 1);
-    }
-
-    /**
-     * Generic test for {@link PreferenceSetting#addGui(PreferenceTabbedPane)}.
-     * @param factory setting factory to test
-     * @param parentClass optional parent setting, can be {@code null}
-     * @param increment expected tab number increment
-     */
-    public static void doTestPreferenceSettingAddGui(
-            PreferenceSettingFactory factory, Class<? extends DefaultTabPreferenceSetting> parentClass, int increment) {
         PreferenceSetting setting = factory.createPreferenceSetting();
         PreferenceTabbedPane tabPane = new PreferenceTabbedPane();
@@ -37,5 +26,5 @@
         setting.addGui(tabPane);
         if (parentClass != null) {
-            assertEquals(tabs + increment, tabPane.getSetting(parentClass).getTabPane().getTabCount());
+            assertEquals(tabs + 1, tabPane.getSetting(parentClass).getTabPane().getTabCount());
             assertEquals(tabPane.getSetting(parentClass), ((SubPreferenceSetting) setting).getTabPreferenceSetting(tabPane));
         }
Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java	(revision 16978)
+++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java	(revision 16979)
@@ -35,5 +35,5 @@
     @Test
     public void testAddGui() {
-        PreferencesTestUtils.doTestPreferenceSettingAddGui(new DrawingPreference.Factory(), DisplayPreference.class, 2);
+        PreferencesTestUtils.doTestPreferenceSettingAddGui(new DrawingPreference.Factory(), DisplayPreference.class);
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/GPXPreferenceTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/GPXPreferenceTest.java	(revision 16979)
+++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/GPXPreferenceTest.java	(revision 16979)
@@ -0,0 +1,39 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.preferences.display;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
+
+/**
+ * Unit tests of {@link GPXPreference} class.
+ */
+public class GPXPreferenceTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Unit test of {@link GPXPreference.Factory}.
+     */
+    @Test
+    public void testGPXPreference() {
+        assertNotNull(new GPXPreference.Factory().createPreferenceSetting());
+    }
+
+    /**
+     * Unit test of {@link GPXPreference#addGui}.
+     */
+    @Test
+    public void testAddGui() {
+        PreferencesTestUtils.doTestPreferenceSettingAddGui(new GPXPreference.Factory(), DisplayPreference.class);
+    }
+}