Index: trunk/test/unit/org/openstreetmap/josm/data/PreferencesUtilsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/PreferencesUtilsTest.java	(revision 12826)
+++ trunk/test/unit/org/openstreetmap/josm/data/PreferencesUtilsTest.java	(revision 12826)
@@ -0,0 +1,56 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
+
+/**
+ * Unit tests for class {@link PreferencesUtils}.
+ */
+public class PreferencesUtilsTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Setup test.
+     */
+    @Before
+    public void setUp() {
+        PreferencesUtils.resetLog();
+    }
+
+    /**
+     * Test method for {@link PreferencesUtils#log}.
+     */
+    @Test
+    public void testLog() {
+        assertEquals("", PreferencesUtils.getLog());
+        PreferencesUtils.log("test");
+        assertEquals("test\n", PreferencesUtils.getLog());
+        PreferencesUtils.log("%d\n", 100);
+        assertEquals("test\n100\n", PreferencesUtils.getLog());
+        PreferencesUtils.log("test");
+        assertEquals("test\n100\ntest\n", PreferencesUtils.getLog());
+    }
+
+    /**
+     * Tests that {@code PreferencesUtils} satisfies utility class criterias.
+     * @throws ReflectiveOperationException if an error occurs
+     */
+    @Test
+    public void testUtilityClass() throws ReflectiveOperationException {
+        UtilityClassTestUtil.assertUtilityClassWellDefined(PreferencesUtils.class);
+    }
+}
Index: trunk/test/unit/org/openstreetmap/josm/gui/io/CustomConfiguratorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/io/CustomConfiguratorTest.java	(revision 12812)
+++ trunk/test/unit/org/openstreetmap/josm/gui/io/CustomConfiguratorTest.java	(revision 12826)
@@ -13,5 +13,4 @@
 import java.util.Collections;
 
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -24,5 +23,4 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.trajano.commons.testing.UtilityClassTestUtil;
 
 /**
@@ -37,26 +35,4 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
-
-    /**
-     * Setup test.
-     */
-    @Before
-    public void setUp() {
-        CustomConfigurator.resetLog();
-    }
-
-    /**
-     * Test method for {@link CustomConfigurator#log}.
-     */
-    @Test
-    public void testLog() {
-        assertEquals("", CustomConfigurator.getLog());
-        CustomConfigurator.log("test");
-        assertEquals("test\n", CustomConfigurator.getLog());
-        CustomConfigurator.log("%d\n", 100);
-        assertEquals("test\n100\n", CustomConfigurator.getLog());
-        CustomConfigurator.log("test");
-        assertEquals("test\n100\ntest\n", CustomConfigurator.getLog());
-    }
 
     /**
@@ -106,5 +82,5 @@
         assertTrue(Main.pref.getCollection("test").isEmpty());
         CustomConfigurator.readXML(TestUtils.getTestDataRoot() + "customconfigurator", "append.xml");
-        String log = CustomConfigurator.getLog();
+        String log = PreferencesUtils.getLog();
         assertFalse(log, log.contains("Error"));
         assertFalse(Main.pref.getCollection("test").isEmpty());
@@ -117,16 +93,7 @@
         assertEquals(1, pref.getCollection("lorem_ipsum").size());
         CustomConfigurator.readXML(new File(TestUtils.getTestDataRoot() + "customconfigurator", "replace.xml"), pref);
-        log = CustomConfigurator.getLog();
+        log = PreferencesUtils.getLog();
         assertFalse(log, log.contains("Error"));
         assertEquals(9, pref.getCollection("lorem_ipsum").size());
     }
-
-    /**
-     * Tests that {@code PreferencesUtils} satisfies utility class criterias.
-     * @throws ReflectiveOperationException if an error occurs
-     */
-    @Test
-    public void testUtilityClass() throws ReflectiveOperationException {
-        UtilityClassTestUtil.assertUtilityClassWellDefined(PreferencesUtils.class);
-    }
 }