Index: trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
===================================================================
--- trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java	(revision 12825)
+++ trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java	(revision 13175)
@@ -14,12 +14,11 @@
 import org.apache.commons.lang.RandomStringUtils;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.PerformanceTestUtils;
 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer;
 import org.openstreetmap.josm.data.osm.OsmDataGenerator.KeyValueDataGenerator;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -48,8 +47,7 @@
      * Prepare the test.
      */
-    @BeforeClass
-    public static void createJOSMFixture() {
-        JOSMFixture.createPerformanceTestFixture().init(true);
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().projection();
 
     /**
Index: trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java
===================================================================
--- trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java	(revision 12825)
+++ trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java	(revision 13175)
@@ -50,4 +50,7 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
+/**
+ * Performance test of map renderer.
+ */
 public class MapRendererPerformanceTest {
 
@@ -87,4 +90,8 @@
     public Timeout globalTimeout = Timeout.seconds(15*60);
 
+    /**
+     * Initializes test environment.
+     * @throws Exception if any error occurs
+     */
     @BeforeClass
     public static void load() throws Exception {
@@ -152,4 +159,7 @@
     }
 
+    /**
+     * Cleanup test environment.
+     */
     @AfterClass
     public static void cleanUp() {
@@ -319,8 +329,10 @@
 
     private static void setFilterStyleActive(boolean active) {
-        if (filterStyle.active != active) {
-            MapPaintStyles.toggleStyleActive(filterStyleIdx);
-        }
-        Assert.assertEquals(active, filterStyle.active);
+        if (filterStyle != null) {
+            if (filterStyle.active != active) {
+                MapPaintStyles.toggleStyleActive(filterStyleIdx);
+            }
+            Assert.assertEquals(active, filterStyle.active);
+        }
     }