Index: trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 12842)
+++ trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 12848)
@@ -23,4 +23,5 @@
 import org.openstreetmap.josm.io.CertificateAmendment;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.I18n;
@@ -96,4 +97,5 @@
         System.setProperty("josm.home", josmHome);
         TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+        Config.setPreferencesInstance(Main.pref);
         Main.pref.resetToInitialState();
         Main.pref.enableSaveOnPut(false);
Index: trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 12842)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 12848)
@@ -40,4 +40,5 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -276,4 +277,5 @@
         cleanUpFromJosmFixture();
 
+        Config.setPreferencesInstance(Main.pref);
         // All tests use the same timezone.
         TimeZone.setDefault(DateUtils.UTC);