Index: applications/editors/josm/plugins/print/test/unit/org/openstreetmap/josm/plugins/print/PrintDialogTest.java
===================================================================
--- applications/editors/josm/plugins/print/test/unit/org/openstreetmap/josm/plugins/print/PrintDialogTest.java	(revision 36031)
+++ applications/editors/josm/plugins/print/test/unit/org/openstreetmap/josm/plugins/print/PrintDialogTest.java	(revision 36064)
@@ -2,5 +2,6 @@
 package org.openstreetmap.josm.plugins.print;
 
-import static org.junit.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
@@ -8,20 +9,13 @@
 import javax.print.attribute.standard.OrientationRequested;
 
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
 /**
  * Unit test of {@link PrintDialog} class.
  */
-public class PrintDialogTest {
-
-    /**
-     * Setup test.
-     */
-    @Rule
-    public JOSMTestRules rules = new JOSMTestRules().preferences();
-
+@BasicPreferences
+class PrintDialogTest {
     /**
      * Unit test of {@link PrintDialog#unmarshallPrintSetting}
@@ -29,5 +23,5 @@
      */
     @Test
-    public void testUnmarshallPrintSetting() throws ReflectiveOperationException {
+    void testUnmarshallPrintSetting() throws ReflectiveOperationException {
         assertEquals(OrientationRequested.PORTRAIT, PrintDialog.unmarshallPrintSetting(Arrays.asList(
                 "javax.print.attribute.standard.OrientationRequested",
@@ -42,6 +36,6 @@
      */
     @Test
-    @Ignore("not fixed yet")
-    public void testTicket13302() throws ReflectiveOperationException {
+    @Disabled("not fixed yet")
+    void testTicket13302() throws ReflectiveOperationException {
         assertEquals(OrientationRequested.PORTRAIT, PrintDialog.unmarshallPrintSetting(Arrays.asList(
                 "javax.print.attribute.standard.MediaSizeName",