Index: trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java	(revision 18821)
+++ trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java	(revision 18853)
@@ -6,8 +6,6 @@
 import java.io.IOException;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
-import org.openstreetmap.josm.JOSMFixture;
 
 /**
@@ -15,13 +13,4 @@
  */
 class GettingStartedTest {
-
-    /**
-     * Setup test.
-     */
-    @BeforeAll
-    public static void init() {
-        JOSMFixture.createFunctionalTestFixture().init();
-    }
-
     /**
      * Tests that image links are replaced.
Index: trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java	(revision 18821)
+++ trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java	(revision 18853)
@@ -6,5 +6,4 @@
 import javax.swing.JFrame;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -18,9 +17,4 @@
 
 class HistoryBrowserTestFT extends JFrame {
-
-    @BeforeAll
-    public static void init() {
-        JOSMFixture.createFunctionalTestFixture().init();
-    }
 
     private HistoryBrowser browser;
@@ -57,5 +51,5 @@
 
     public static void main(String[] args) {
-        HistoryBrowserTestFT.init();
+        JOSMFixture.createFunctionalTestFixture().init();
         new HistoryBrowserTestFT().setVisible(true);
     }
Index: trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java	(revision 18821)
+++ trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java	(revision 18853)
@@ -25,11 +25,8 @@
 import javax.swing.ImageIcon;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -38,9 +35,7 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.gui.tagging.presets.items.Key;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.xml.sax.SAXException;
 
 import com.kitfox.svg.SVGConst;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -49,12 +44,4 @@
  */
 class ImageProviderTest {
-
-    /**
-     * Setup test.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
-
     private static final class LogHandler14319 extends Handler {
         boolean failed;
@@ -74,12 +61,4 @@
         public void close() throws SecurityException {
         }
-    }
-
-    /**
-     * Setup test.
-     */
-    @BeforeAll
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
     }
 
Index: trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestIT.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestIT.java	(revision 18821)
+++ trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestIT.java	(revision 18853)
@@ -5,8 +5,4 @@
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -14,12 +10,4 @@
  */
 class ImageProviderTestIT {
-
-    /**
-     * Setup test.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
-
     /**
      * Test fetching an image using {@code wiki://} protocol.
Index: trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestManual.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestManual.java	(revision 18821)
+++ trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestManual.java	(revision 18853)
@@ -11,10 +11,6 @@
 import javax.swing.JPanel;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -22,17 +18,9 @@
  */
 class ImageProviderTestManual {
-
-    /**
-     * Setup test.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
-
     /**
      * Test getting a cursor
      * @throws InterruptedException in case of thread interruption
      */
-    @Disabled("manual execution only, as the look of the cursor cannot be checked automatedly")
+    @Disabled("manual execution only, as the look of the cursor cannot be checked automatically")
     @Test
     void testGetCursor() throws InterruptedException {