Index: trunk/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java	(revision 3034)
+++ trunk/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java	(revision 3988)
@@ -11,5 +11,5 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.DataSetMergerTest;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.io.OsmApi;
@@ -40,5 +40,5 @@
         //
         try {
-            testProperties.load(DataSetMergerTest.class.getResourceAsStream(testPropertiesResourceName));
+            testProperties.load(JOSMFixture.class.getResourceAsStream(testPropertiesResourceName));
         } catch(Exception e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", testPropertiesResourceName));
@@ -58,4 +58,5 @@
         }
         System.setProperty("josm.home", josmHome);
+        Main.pref = new Preferences();
         I18n.init();
         // initialize the plaform hook, and