Index: trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 8510)
+++ trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 8511)
@@ -23,5 +23,5 @@
      * @return A new test fixture for unit tests
      */
-    static public JOSMFixture createUnitTestFixture() {
+    public static JOSMFixture createUnitTestFixture() {
         return new JOSMFixture("test/config/unit-josm.home");
     }
@@ -31,5 +31,5 @@
      * @return A new test fixture for functional tests
      */
-    static public JOSMFixture createFunctionalTestFixture() {
+    public static JOSMFixture createFunctionalTestFixture() {
         return new JOSMFixture("test/config/functional-josm.home");
     }
@@ -39,5 +39,5 @@
      * @return A new test fixture for performance tests
      */
-    static public JOSMFixture createPerformanceTestFixture() {
+    public static JOSMFixture createPerformanceTestFixture() {
         return new JOSMFixture("test/config/performance-josm.home");
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 8510)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 8511)
@@ -25,5 +25,5 @@
 public class PropertiesMergeModelTest {
 
-    public static abstract class TestObserver implements Observer {
+    public abstract static class TestObserver implements Observer {
         public int numInvocations;
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/PresetClassificationsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/PresetClassificationsTest.java	(revision 8510)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/PresetClassificationsTest.java	(revision 8511)
@@ -23,5 +23,5 @@
 public class PresetClassificationsTest {
 
-    final static TaggingPresetSelector.PresetClassifications classifications = new TaggingPresetSelector.PresetClassifications();
+    static final TaggingPresetSelector.PresetClassifications classifications = new TaggingPresetSelector.PresetClassifications();
 
     /**