Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/SophoxServerPreference.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/SophoxServerPreference.java	(revision 34172)
+++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/SophoxServerPreference.java	(revision 34173)
@@ -32,5 +32,5 @@
     public static class Factory implements PreferenceSettingFactory {
         @Override
-        public PreferenceSetting createPreferenceSetting() {
+        public SophoxServerPreference createPreferenceSetting() {
             return new SophoxServerPreference();
         }
Index: /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/gui/SophoxServerPreferenceTest.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/gui/SophoxServerPreferenceTest.java	(revision 34172)
+++ /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/gui/SophoxServerPreferenceTest.java	(revision 34173)
@@ -2,13 +2,13 @@
 package org.wikipedia.gui;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
+import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.preferences.server.ServerAccessPreference;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -37,5 +37,14 @@
     @Test
     public void testAddGui() {
-        PreferencesTestUtils.doTestPreferenceSettingAddGui(new SophoxServerPreference.Factory(), ServerAccessPreference.class);
+        final SophoxServerPreference setting = new SophoxServerPreference.Factory().createPreferenceSetting();
+        final PreferenceTabbedPane tabPane = new PreferenceTabbedPane();
+        tabPane.buildGui();
+        int tabs = tabPane.getSetting(ServerAccessPreference.class).getTabPane().getTabCount();
+        setting.addGui(tabPane);
+
+        assertEquals(tabs + 1, tabPane.getSetting(ServerAccessPreference.class).getTabPane().getTabCount());
+        assertEquals(tabPane.getSetting(ServerAccessPreference.class), setting.getTabPreferenceSetting(tabPane));
+
+        setting.ok();
     }
 }