Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/AllUnitTests.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/AllUnitTests.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/AllUnitTests.java	(revision 36064)
@@ -2,10 +2,10 @@
 package org.openstreetmap.josm.plugins.turnrestrictions;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.AllEditorTests;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
     AllEditorTests.class,
     TurnRestrictionBuilderTest.class
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilderTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilderTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilderTest.java	(revision 36064)
@@ -2,9 +2,9 @@
 package org.openstreetmap.josm.plugins.turnrestrictions;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.openstreetmap.josm.plugins.turnrestrictions.TurnRestrictionBuilder.intersectionAngle;
 import static org.openstreetmap.josm.plugins.turnrestrictions.TurnRestrictionBuilder.selectToWayAfterSplit;
@@ -12,9 +12,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -25,22 +25,17 @@
 import org.openstreetmap.josm.plugins.turnrestrictions.TurnRestrictionBuilder.RelativeWayJoinOrientation;
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionType;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-public class TurnRestrictionBuilderTest {
-
-    @Rule
-    public JOSMTestRules rules = new JOSMTestRules().preferences();
-
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+
+@BasicPreferences
+class TurnRestrictionBuilderTest {
     TurnRestrictionBuilder builder = new TurnRestrictionBuilder();
 
     boolean hasExactlyOneMemberWithRole(Relation r, final String role) {
-        return r.getMembers().stream().filter(rm -> role.equals(rm.getRole())).findFirst().isPresent();
+        return r.getMembers().stream().anyMatch(rm -> role.equals(rm.getRole()));
     }
 
     OsmPrimitive memberWithRole(Relation r, final String role) {
         Optional<RelationMember> opt = r.getMembers().stream().filter(rm -> role.equals(rm.getRole())).findFirst();
-        if (!opt.isPresent())
-            return null;
-        return opt.get().getMember();
+        return opt.map(RelationMember::getMember).orElse(null);
     }
 
@@ -57,5 +52,5 @@
      */
     @Test
-    public void noUTurn_1() {
+    void testNoUTurn1() {
         Way w = new Way(1);
         Node n1 = new Node(1);
@@ -84,5 +79,5 @@
     */
    @Test
-   public void noUTurn_2() {
+   void testNoUTurn2() {
        Way w = new Way(1);
        Node n1 = new Node(1);
@@ -106,10 +101,10 @@
 
    @Test
-   public void nullSelection() {
+   void testNullSelection() {
        assertEmptyTurnRestriction(builder.build(null));
    }
 
    @Test
-   public void emptySelection() {
+   void testEmptySelection() {
        assertEmptyTurnRestriction(builder.build(new ArrayList<>()));
    }
@@ -120,7 +115,7 @@
     */
    @Test
-   public void oneSelectedWay() {
+   void testOneSelectedWay() {
        Way w = new Way(1);
-       Relation tr = builder.build(Arrays.asList(w));
+       Relation tr = builder.build(Collections.singletonList(w));
        assertNotNull(tr);
        assertEquals("restriction", tr.get("type"));
@@ -134,5 +129,5 @@
     */
    @Test
-   public void twoUnconnectedWays() {
+   void testTwoUnconnectedWays() {
        Way w1 = new Way(1);
        w1.setNodes(Arrays.asList(new Node(11), new Node(12)));
@@ -159,5 +154,5 @@
     */
    @Test
-   public void twoConnectedWays_1() {
+   void testTwoConnectedWays1() {
        Node n1 = new Node(1);
        n1.setCoor(new LatLon(1, 1));
@@ -217,5 +212,5 @@
     */
    @Test
-   public void twoConnectedWays_2() {
+   void testTwoConnectedWays2() {
        Node n1 = new Node(1);
        n1.setCoor(new LatLon(5, 5));
@@ -260,95 +255,93 @@
 
    /**
-   * Two connected ways. end node of the first way connects to end node of
-   * the second way. left turn.
-   *
-   *
-   *           (7,5) -
-   *             ^     -    w2
-   *             | w1     ------> (6,7)
-   *             |
-   *           (5,5)
-   */
-  @Test
-  public void twoConnectedWays_3() {
-      Node n1 = new Node(1);
-      n1.setCoor(new LatLon(5, 5));
-      Node n2 = new Node(2);
-      n2.setCoor(new LatLon(7, 5));
-      Node n3 = new Node(3);
-      n3.setCoor(new LatLon(6, 7));
-
-      Way w1 = new Way(1);
-      w1.setNodes(Arrays.asList(n1, n2));
-      Way w2 = new Way(2);
-      w2.setNodes(Arrays.asList(n2, n3));
-
-      Relation tr = builder.build(Arrays.asList(w1, w2, n2));
-
-      assertNotNull(tr);
-      assertEquals("restriction", tr.get("type"));
-      assertEquals(3, tr.getMembersCount());
-      assertEquals(w1, memberWithRole(tr, "from"));
-      assertEquals(w2, memberWithRole(tr, "to"));
-      assertEquals(n2, memberWithRole(tr, "via"));
-
-      assertEquals("no_right_turn", tr.get("restriction"));
-  }
-
-  /**
-  * Two connected ways. end node of the first way connects to end node of
-  * the second way. left turn.
-  *
-  *
-  *           (10,10)
-  *                 \
-  *                  \
-  *                   \
-  *                    v
-  *                     (8,15)
-  *                    /
-  *                   /
-  *                  /
-  *                 v
-  *            (5,11)
-  */
- @Test
- public void twoConnectedWays_4() {
-     Node n1 = new Node(1);
-     n1.setCoor(new LatLon(10, 10));
-     Node n2 = new Node(2);
-     n2.setCoor(new LatLon(8, 15));
-     Node n3 = new Node(3);
-     n3.setCoor(new LatLon(5, 11));
-
-     Way w1 = new Way(1);
-     w1.setNodes(Arrays.asList(n1, n2));
-     Way w2 = new Way(2);
-     w2.setNodes(Arrays.asList(n2, n3));
-
-     Relation tr = builder.build(Arrays.asList(w1, w2, n2));
-
-     assertNotNull(tr);
-     assertEquals("restriction", tr.get("type"));
-     assertEquals(3, tr.getMembersCount());
-     assertEquals(w1, memberWithRole(tr, "from"));
-     assertEquals(w2, memberWithRole(tr, "to"));
-     assertEquals(n2, memberWithRole(tr, "via"));
-
-     assertEquals("no_right_turn", tr.get("restriction"));
-
-     /*
-      * opposite order, from w2 to w1. In  this case we have left turn.
-      */
-     tr = builder.build(Arrays.asList(w2, w1, n2));
-
-     assertNotNull(tr);
-     assertEquals("restriction", tr.get("type"));
-     assertEquals(3, tr.getMembersCount());
-     assertEquals(w2, memberWithRole(tr, "from"));
-     assertEquals(w1, memberWithRole(tr, "to"));
-     assertEquals(n2, memberWithRole(tr, "via"));
-
-     assertEquals("no_left_turn", tr.get("restriction"));
+    * Two connected ways. end node of the first way connects to end node of
+    * the second way. left turn.
+    *
+    *           (7,5) -
+    *             ^     -    w2
+    *             | w1     ------> (6,7)
+    *             |
+    *           (5,5)
+    */
+    @Test
+    void testTwoConnectedWays3() {
+        Node n1 = new Node(1);
+        n1.setCoor(new LatLon(5, 5));
+        Node n2 = new Node(2);
+        n2.setCoor(new LatLon(7, 5));
+        Node n3 = new Node(3);
+        n3.setCoor(new LatLon(6, 7));
+
+        Way w1 = new Way(1);
+        w1.setNodes(Arrays.asList(n1, n2));
+        Way w2 = new Way(2);
+        w2.setNodes(Arrays.asList(n2, n3));
+
+        Relation tr = builder.build(Arrays.asList(w1, w2, n2));
+
+        assertNotNull(tr);
+        assertEquals("restriction", tr.get("type"));
+        assertEquals(3, tr.getMembersCount());
+        assertEquals(w1, memberWithRole(tr, "from"));
+        assertEquals(w2, memberWithRole(tr, "to"));
+        assertEquals(n2, memberWithRole(tr, "via"));
+
+        assertEquals("no_right_turn", tr.get("restriction"));
+    }
+
+    /**
+     * Two connected ways. end node of the first way connects to end node of
+     * the second way. left turn.
+     *
+     *           (10,10)
+     *                 \
+     *                  \
+     *                   \
+     *                    v
+     *                     (8,15)
+     *                    /
+     *                   /
+     *                  /
+     *                 v
+     *            (5,11)
+     */
+    @Test
+    void testTwoConnectedWays4() {
+        Node n1 = new Node(1);
+        n1.setCoor(new LatLon(10, 10));
+        Node n2 = new Node(2);
+        n2.setCoor(new LatLon(8, 15));
+        Node n3 = new Node(3);
+        n3.setCoor(new LatLon(5, 11));
+
+        Way w1 = new Way(1);
+        w1.setNodes(Arrays.asList(n1, n2));
+        Way w2 = new Way(2);
+        w2.setNodes(Arrays.asList(n2, n3));
+
+        Relation tr = builder.build(Arrays.asList(w1, w2, n2));
+
+        assertNotNull(tr);
+        assertEquals("restriction", tr.get("type"));
+        assertEquals(3, tr.getMembersCount());
+        assertEquals(w1, memberWithRole(tr, "from"));
+        assertEquals(w2, memberWithRole(tr, "to"));
+        assertEquals(n2, memberWithRole(tr, "via"));
+
+        assertEquals("no_right_turn", tr.get("restriction"));
+
+        /*
+         * opposite order, from w2 to w1. In  this case we have left turn.
+         */
+        tr = builder.build(Arrays.asList(w2, w1, n2));
+
+        assertNotNull(tr);
+        assertEquals("restriction", tr.get("type"));
+        assertEquals(3, tr.getMembersCount());
+        assertEquals(w2, memberWithRole(tr, "from"));
+        assertEquals(w1, memberWithRole(tr, "to"));
+        assertEquals(n2, memberWithRole(tr, "via"));
+
+        assertEquals("no_left_turn", tr.get("restriction"));
     }
 
@@ -374,5 +367,5 @@
       */
      @Test
-     public void intersectionAngle_1() {
+     void testIntersectionAngle1() {
          Node n1 = nn(1, 5, 5);
          Node n2 = nn(2, 5, 10);
@@ -429,5 +422,5 @@
      */
     @Test
-    public void intersectionAngle_2() {
+    void testIntersectionAngle2() {
         Node n1 = nn(1, 5, 5);
         Node n2 = nn(2, 5, 10);
@@ -473,99 +466,98 @@
      *          /
      *      (-5, -10) n2
-    *           ^
-    *           |
-    *           | from
-    *           |
-    *       (-10,-10) n1
-    */
-   @Test
-   public void intersectionAngle_3() {
-       Node n1 = nn(1, -10, -10);
-       Node n2 = nn(2, -5, -10);
-       Node n3 = nn(3, -1, -6);
-       Way from = nw(1, n1, n2);
-       Way to = nw(2, n2, n3);
-
-       double a = TurnRestrictionBuilder.intersectionAngle(from, to);
-       assertEquals(45, Math.toDegrees(a), 1e-7);
-
-       /*
-        * if reversed from, the intersection angle is still 45
-        */
-       from = nw(1, n2, n1);
-       to = nw(2, n2, n3);
-       a = TurnRestrictionBuilder.intersectionAngle(from, to);
-       assertEquals(45, Math.toDegrees(a), 1e-7);
-
-       /*
-       * if reversed to, the intersection angle is still 45
-       */
-       from = nw(1, n1, n2);
-       to = nw(2, n3, n2);
-       a = TurnRestrictionBuilder.intersectionAngle(from, to);
-       assertEquals(45, Math.toDegrees(a), 1e-7);
-
-       /*
-       * if reversed both, the intersection angle is still 45
-       */
-       from = nw(1, n2, n1);
-       to = nw(2, n3, n2);
-       a = TurnRestrictionBuilder.intersectionAngle(from, to);
-       assertEquals(45, Math.toDegrees(a), 1e-7);
-   }
-
-   /**
-   *
-   *
-   *         (-1,-14) (n3)
-   *            ^
-   *            \
-   *             \ to
-   *              \
-   *          (-5, -10) n2
-  *               ^
-  *               |
-  *               | from
-  *               |
-  *           (-10,-10) n1
-  */
- @Test
- public void intersectionAngle_4() {
-     Node n1 = nn(1, -10, -10);
-     Node n2 = nn(2, -5, -10);
-     Node n3 = nn(3, -1, -14);
-     Way from = nw(1, n1, n2);
-     Way to = nw(2, n2, n3);
-
-     double a = TurnRestrictionBuilder.intersectionAngle(from, to);
-     assertEquals(-45, Math.toDegrees(a), 1e-7);
-
-     /*
-      * if reversed from, the intersection angle is still -45
-      */
-     from = nw(1, n2, n1);
-     to = nw(2, n2, n3);
-     a = TurnRestrictionBuilder.intersectionAngle(from, to);
-     assertEquals(-45, Math.toDegrees(a), 1e-7);
-
-     /*
-     * if reversed to, the intersection angle is still -45
+     *           ^
+     *           |
+     *           | from
+     *           |
+     *       (-10,-10) n1
      */
-     from = nw(1, n1, n2);
-     to = nw(2, n3, n2);
-     a = TurnRestrictionBuilder.intersectionAngle(from, to);
-     assertEquals(-45, Math.toDegrees(a), 1e-7);
-
-     /*
-     * if reversed both, the intersection angle is still 45
+    @Test
+    void testIntersectionAngle3() {
+        Node n1 = nn(1, -10, -10);
+        Node n2 = nn(2, -5, -10);
+        Node n3 = nn(3, -1, -6);
+        Way from = nw(1, n1, n2);
+        Way to = nw(2, n2, n3);
+
+        double a = TurnRestrictionBuilder.intersectionAngle(from, to);
+        assertEquals(45, Math.toDegrees(a), 1e-7);
+
+        /*
+         * if reversed from, the intersection angle is still 45
+         */
+        from = nw(1, n2, n1);
+        to = nw(2, n2, n3);
+        a = TurnRestrictionBuilder.intersectionAngle(from, to);
+        assertEquals(45, Math.toDegrees(a), 1e-7);
+
+        /*
+        * if reversed to, the intersection angle is still 45
+        */
+        from = nw(1, n1, n2);
+        to = nw(2, n3, n2);
+        a = TurnRestrictionBuilder.intersectionAngle(from, to);
+        assertEquals(45, Math.toDegrees(a), 1e-7);
+
+        /*
+        * if reversed both, the intersection angle is still 45
+        */
+        from = nw(1, n2, n1);
+        to = nw(2, n3, n2);
+        a = TurnRestrictionBuilder.intersectionAngle(from, to);
+        assertEquals(45, Math.toDegrees(a), 1e-7);
+    }
+
+    /**
+     *
+     *
+     *         (-1,-14) (n3)
+     *            ^
+     *            \
+     *             \ to
+     *              \
+     *          (-5, -10) n2
+     *               ^
+     *               |
+     *               | from
+     *               |
+     *           (-10,-10) n1
      */
-     from = nw(1, n2, n1);
-     to = nw(2, n3, n2);
-     a = TurnRestrictionBuilder.intersectionAngle(from, to);
-     assertEquals(-45, Math.toDegrees(a), 1e-7);
- }
-
-
-     /*
+    @Test
+    void testIntersectionAngle4() {
+        Node n1 = nn(1, -10, -10);
+        Node n2 = nn(2, -5, -10);
+        Node n3 = nn(3, -1, -14);
+        Way from = nw(1, n1, n2);
+        Way to = nw(2, n2, n3);
+
+        double a = TurnRestrictionBuilder.intersectionAngle(from, to);
+        assertEquals(-45, Math.toDegrees(a), 1e-7);
+
+        /*
+         * if reversed from, the intersection angle is still -45
+         */
+        from = nw(1, n2, n1);
+        to = nw(2, n2, n3);
+        a = TurnRestrictionBuilder.intersectionAngle(from, to);
+        assertEquals(-45, Math.toDegrees(a), 1e-7);
+
+        /*
+        * if reversed to, the intersection angle is still -45
+        */
+        from = nw(1, n1, n2);
+        to = nw(2, n3, n2);
+        a = TurnRestrictionBuilder.intersectionAngle(from, to);
+        assertEquals(-45, Math.toDegrees(a), 1e-7);
+
+        /*
+        * if reversed both, the intersection angle is still 45
+        */
+        from = nw(1, n2, n1);
+        to = nw(2, n3, n2);
+        a = TurnRestrictionBuilder.intersectionAngle(from, to);
+        assertEquals(-45, Math.toDegrees(a), 1e-7);
+    }
+
+    /**
      *
      *      n21        w21        n22       w22            n23
@@ -579,5 +571,5 @@
      */
     @Test
-    public void splitToWay() {
+    void testSplitToWay() {
         Node n11 = new Node(11);
         n11.setCoor(new LatLon(5, 15));
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/AllEditorTests.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/AllEditorTests.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/AllEditorTests.java	(revision 36064)
@@ -2,11 +2,11 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
 
 import junit.framework.TestCase;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
     JosmSelectionListModelTest.class,
     TurnRestrictionEditorModelUnitTest.class,
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanelTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanelTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanelTest.java	(revision 36064)
@@ -7,5 +7,5 @@
 import javax.swing.JFrame;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -15,5 +15,5 @@
  *
  */
-@Ignore("no test")
+@Disabled("no test")
 public class BasicEditorPanelTest extends JFrame {
 
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/ExceptValueModelTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/ExceptValueModelTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/ExceptValueModelTest.java	(revision 36064)
@@ -2,25 +2,30 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
-public class ExceptValueModelTest {
+class ExceptValueModelTest {
 
-    @Test
-    public void testConstructors() {
-        new ExceptValueModel();
-        new ExceptValueModel(null);
-        new ExceptValueModel("");
-        new ExceptValueModel("  ");
-        new ExceptValueModel("hgv");
-        new ExceptValueModel("hgv;psv");
-        new ExceptValueModel("non_standard");
+    @ParameterizedTest
+    @ValueSource(strings = {"", "  ", "hgv", "hgv;psv", "non_standard"})
+    void testStringConstructors(String value) {
+        assertDoesNotThrow(() -> new ExceptValueModel(value));
     }
 
     @Test
-    public void testSetValue() {
+    void testAdditionalConstructors() {
+        assertAll(() -> assertDoesNotThrow(() -> new ExceptValueModel()),
+                () -> assertDoesNotThrow(() -> new ExceptValueModel(null)));
+    }
+
+    @Test
+    void testSetValue() {
         ExceptValueModel evm;
 
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModelTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModelTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModelTest.java	(revision 36064)
@@ -2,7 +2,9 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
@@ -14,6 +16,5 @@
 import javax.swing.ListSelectionModel;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -24,26 +25,25 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
 /**
  * Unit test for {@see JosmSelctionListModel}
  */
-public class JosmSelectionListModelTest {
-
-    @Rule
-    public JOSMTestRules rules = new JOSMTestRules().preferences();
+@BasicPreferences
+class JosmSelectionListModelTest {
 
     @Test
-    public void testConstructor() {
-        assertNotNull(new JosmSelectionListModel(new OsmDataLayer(new DataSet(), "test", null)));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testConstructorNull() {
-        new JosmSelectionListModel(null);
+    void testConstructor() {
+        OsmDataLayer layer = new OsmDataLayer(new DataSet(), "test", null);
+        assertDoesNotThrow(() -> new JosmSelectionListModel(layer));
     }
 
     @Test
-    public void test_setJOSMSelection() {
+    void testConstructorNull() {
+        assertThrows(IllegalArgumentException.class, () -> new JosmSelectionListModel(null));
+    }
+
+    @Test
+    void testSetJOSMSelection() {
         DataSet ds = new DataSet();
         OsmDataLayer layer = new OsmDataLayer(ds, "test", null);
@@ -66,5 +66,5 @@
 
     @Test
-    public void test_setJOSMSelection_withSelected() {
+    void testSetJOSMSelectionWithSelected() {
         DataSet ds = new DataSet();
         OsmDataLayer layer = new OsmDataLayer(ds, "test", null);
@@ -84,5 +84,5 @@
 
     @Test
-    public void test_getSelected() {
+    void testGetSelected() {
         DataSet ds = new DataSet();
         OsmDataLayer layer = new OsmDataLayer(ds, "test", null);
@@ -105,5 +105,5 @@
 
     @Test
-    public void test_setSelected() {
+    void testSetSelected() {
         // set selected with null is OK - nothing selected thereafter
         JosmSelectionListModel model = new JosmSelectionListModel(new OsmDataLayer(new DataSet(), "test", null));
@@ -118,19 +118,19 @@
         List<OsmPrimitive> objects = (Arrays.asList(new Node(new LatLon(1, 1)), new Way(), new Relation()));
         model.setJOSMSelection(objects);
-        model.setSelected(Arrays.asList(objects.get(0)));
+        model.setSelected(Collections.singletonList(objects.get(0)));
         assertEquals(Collections.singleton(objects.get(0)), model.getSelected());
 
         // select an object not-existing in the list of displayed objects
         model.setJOSMSelection(objects);
-        model.setSelected(Arrays.asList(new Way()));
+        model.setSelected(Collections.singletonList(new Way()));
         assertTrue(model.getSelected().isEmpty());
     }
 
     @Test
-    public void test_editLayerChanged() {
+    void testEditLayerChanged() {
         DataSet ds = new DataSet();
 
         List<OsmPrimitive> objects = (Arrays.asList(new Node(new LatLon(1, 1)), new Way(), new Relation()));
-        objects.stream().forEach(ds::addPrimitive);
+        objects.forEach(ds::addPrimitive);
 
         OsmDataLayer layer1 = new OsmDataLayer(ds, "layer1", null);
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBoxTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBoxTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBoxTest.java	(revision 36064)
@@ -8,5 +8,5 @@
 import javax.swing.JFrame;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -17,5 +17,5 @@
  *
  */
-@Ignore("no test")
+@Disabled("no test")
 public class TurnRestrictionComboBoxTest extends JFrame {
 
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModelUnitTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModelUnitTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModelUnitTest.java	(revision 36064)
@@ -2,8 +2,9 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionLegRole.FROM;
 import static org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionLegRole.TO;
@@ -13,7 +14,6 @@
 import java.util.Collections;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -21,4 +21,5 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -26,13 +27,11 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
 /**
  * This is a unit test for {@link TurnRestrictionEditorModel}
  */
-public class TurnRestrictionEditorModelUnitTest {
-
-    @Rule
-    public JOSMTestRules rules = new JOSMTestRules().preferences();
+@BasicPreferences
+class TurnRestrictionEditorModelUnitTest {
 
     private final NavigationControler navigationControlerMock = new NavigationControler() {
@@ -114,5 +113,5 @@
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         ds = new DataSet();
@@ -124,7 +123,7 @@
      * Test the constructor
      */
-    @Test(expected = IllegalArgumentException.class)
-    public void testConstructor1() {
-        new TurnRestrictionEditorModel(null, navigationControlerMock);
+    @Test
+    void testConstructor1() {
+        assertThrows(IllegalArgumentException.class, () -> new TurnRestrictionEditorModel(null, navigationControlerMock));
     }
 
@@ -132,11 +131,11 @@
      * Test the constructor
      */
-    @Test(expected = IllegalArgumentException.class)
-    public void testConstructor2() {
-        new TurnRestrictionEditorModel(layer, null);
-    }
-
-    @Test
-    public void testPopulateEmptyTurnRestriction() {
+    @Test
+    void testConstructor2() {
+        assertThrows(IllegalArgumentException.class, () -> new TurnRestrictionEditorModel(layer, null));
+    }
+
+    @Test
+    void testPopulateEmptyTurnRestriction() {
         // an "empty" turn restriction with a public id
         Relation r = new Relation(1);
@@ -156,5 +155,5 @@
      */
     @Test
-    public void test_populate_SimpleStandardTurnRestriction() {
+    void testPopulateSimpleStandardTurnRestriction() {
         buildDataSet1();
         model.populate(rel(1));
@@ -162,5 +161,5 @@
         assertEquals(Collections.singleton(way(2)), model.getTurnRestrictionLeg(FROM));
         assertEquals(Collections.singleton(way(3)), model.getTurnRestrictionLeg(TO));
-        assertEquals(Arrays.asList(node(22)), model.getVias());
+        assertEquals(Collections.singletonList(node(22)), model.getVias());
         assertEquals("no_left_turn", model.getRestrictionTagValue());
         assertEquals("", model.getExcept().getValue());
@@ -168,5 +167,5 @@
 
     @Test
-    public void setFrom() {
+    void testSetFrom() {
         buildDataSet1();
         model.populate(rel(1));
@@ -178,31 +177,22 @@
         // set another way as from
         model.setTurnRestrictionLeg(TurnRestrictionLegRole.FROM, way(4).getPrimitiveId());
-        assertEquals(Collections.singleton(way(4)), model.getTurnRestrictionLeg(TurnRestrictionLegRole.FROM));
+        assertEquals(Collections.singleton(way(4)), model.getTurnRestrictionLeg(FROM));
 
         // delete the/all members with role 'from'
         model.setTurnRestrictionLeg(TurnRestrictionLegRole.FROM, null);
-        assertTrue(model.getTurnRestrictionLeg(TurnRestrictionLegRole.FROM).isEmpty());
-
-        try {
-            // can't add a node as 'from'
-            model.setTurnRestrictionLeg(TurnRestrictionLegRole.FROM, node(21).getPrimitiveId());
-            fail();
-        } catch (IllegalArgumentException e) {
-            // OK
-            System.out.println(e.getMessage());
-        }
-
-        try {
-            // can't set a way as 'from' if it isn't part of the dataset
-            model.setTurnRestrictionLeg(TurnRestrictionLegRole.FROM, new Way().getPrimitiveId());
-            fail();
-        } catch (IllegalStateException e) {
-            // OK
-            System.out.println(e.getMessage());
-        }
-    }
-
-    @Test
-    public void setTo() {
+        assertTrue(model.getTurnRestrictionLeg(FROM).isEmpty());
+
+        // can't add a node as 'from'
+        PrimitiveId node = node(21).getPrimitiveId();
+        assertThrows(IllegalArgumentException.class,
+                () -> model.setTurnRestrictionLeg(TurnRestrictionLegRole.FROM, node));
+
+        // can't set a way as 'from' if it isn't part of the dataset
+        PrimitiveId way = new Way().getPrimitiveId();
+        assertThrows(IllegalStateException.class, () -> model.setTurnRestrictionLeg(TurnRestrictionLegRole.FROM, way));
+    }
+
+    @Test
+    void setTo() {
         buildDataSet1();
         model.populate(rel(1));
@@ -214,27 +204,15 @@
         // set another way as from
         model.setTurnRestrictionLeg(TurnRestrictionLegRole.TO, way(4).getPrimitiveId());
-        assertEquals(Collections.singleton(way(4)), model.getTurnRestrictionLeg(TurnRestrictionLegRole.TO));
+        assertEquals(Collections.singleton(way(4)), model.getTurnRestrictionLeg(TO));
 
         // delete the/all members with role 'from'
         model.setTurnRestrictionLeg(TurnRestrictionLegRole.TO, null);
-        assertTrue(model.getTurnRestrictionLeg(TurnRestrictionLegRole.TO).isEmpty());
-
-        try {
-            // can't add a node as 'from'
-            model.setTurnRestrictionLeg(TurnRestrictionLegRole.TO, node(21).getPrimitiveId());
-            fail();
-        } catch (IllegalArgumentException e) {
-            // OK
-            System.out.println(e.getMessage());
-        }
-
-        try {
-            // can't set a way as 'from' if it isn't part of the dataset
-            model.setTurnRestrictionLeg(TurnRestrictionLegRole.TO, new Way().getPrimitiveId());
-            fail();
-        } catch (IllegalStateException e) {
-            // OK
-            System.out.println(e.getMessage());
-        }
+        assertTrue(model.getTurnRestrictionLeg(TO).isEmpty());
+
+        PrimitiveId node = node(21).getPrimitiveId();
+        assertThrows(IllegalArgumentException.class, () -> model.setTurnRestrictionLeg(TurnRestrictionLegRole.TO, node));
+
+        PrimitiveId way = new Way().getPrimitiveId();
+        assertThrows(IllegalStateException.class, () -> model.setTurnRestrictionLeg(TurnRestrictionLegRole.TO, way));
     }
 
@@ -269,6 +247,6 @@
 
         // one node as via - OK
-        model.setVias(Arrays.asList(node(22)));
-        assertEquals(Arrays.asList(node(22)), model.getVias());
+        model.setVias(Collections.singletonList(node(22)));
+        assertEquals(Collections.singletonList(node(22)), model.getVias());
 
         // pass in null as vias -> remove all vias
@@ -291,9 +269,9 @@
         // null values in the list of vias are skipped
         model.setVias(Arrays.asList(null, node(22)));
-        assertEquals(Arrays.asList(node(22)), model.getVias());
+        assertEquals(Collections.singletonList(node(22)), model.getVias());
 
         try {
             // an object which doesn't belong to the same dataset can't be a via
-            model.setVias(Arrays.asList(new Node(LatLon.ZERO)));
+            model.setVias(Collections.singletonList(new Node(LatLon.ZERO)));
             fail();
         } catch (IllegalArgumentException e) {
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorTest.java	(revision 36064)
@@ -4,5 +4,5 @@
 import javax.swing.JFrame;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -11,5 +11,5 @@
  *
  */
-@Ignore("no test")
+@Disabled("no test")
 public class TurnRestrictionEditorTest extends JFrame {
 
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditorTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditorTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditorTest.java	(revision 36064)
@@ -17,5 +17,5 @@
 import javax.swing.JScrollPane;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -34,5 +34,5 @@
  * {@see TurnRestrictionLegEditor}
  */
-@Ignore("no test")
+@Disabled("no test")
 public class TurnRestrictionLegEditorTest extends JFrame {
 
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditorUnitTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditorUnitTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditorUnitTest.java	(revision 36064)
@@ -2,26 +2,24 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
 
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
 /**
  * Unit test for the {@link TurnRestrictionLegEditor}
  */
-public class TurnRestrictionLegEditorUnitTest {
-
-    @Rule
-    public JOSMTestRules rules = new JOSMTestRules().preferences();
-
+@BasicPreferences
+class TurnRestrictionLegEditorUnitTest {
     private DataSet ds;
     private OsmDataLayer layer;
     private TurnRestrictionEditorModel model;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         ds = new DataSet();
@@ -43,5 +41,5 @@
 
     @Test
-    public void testConstructor1() {
+    void testConstructor1() {
         TurnRestrictionLegEditor editor = new TurnRestrictionLegEditor(model, TurnRestrictionLegRole.FROM);
         assertEquals(model, editor.getModel());
@@ -49,12 +47,12 @@
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testConstructor2() {
-        new TurnRestrictionLegEditor(null, TurnRestrictionLegRole.FROM);
+    @Test
+    void testConstructor2() {
+        assertThrows(IllegalArgumentException.class, () -> new TurnRestrictionLegEditor(null, TurnRestrictionLegRole.FROM));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testConstructor3() {
-        new TurnRestrictionLegEditor(model, null);
+    @Test
+    void testConstructor3() {
+        assertThrows(IllegalArgumentException.class, () -> new TurnRestrictionLegEditor(model, null));
     }
 }
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRendererTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRendererTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRendererTest.java	(revision 36064)
@@ -2,21 +2,17 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import javax.swing.JLabel;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.junit.jupiter.api.Test;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
-public class TurnRestrictionTypeRendererTest {
-
-    @Rule
-    public JOSMTestRules rules = new JOSMTestRules().preferences();
-
+@BasicPreferences
+class TurnRestrictionTypeRendererTest {
     @Test
-    public void test_Constructor() {
+    void testConstructor() {
         TurnRestrictionTypeRenderer renderer = new TurnRestrictionTypeRenderer();
 
@@ -26,5 +22,5 @@
 
     @Test
-    public void test_getListCellRendererComponent_1() {
+    void testGetListCellRendererComponent1() {
         TurnRestrictionTypeRenderer renderer = new TurnRestrictionTypeRenderer();
 
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeTest.java	(revision 36064)
@@ -2,13 +2,14 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class TurnRestrictionTypeTest {
+
+class TurnRestrictionTypeTest {
 
     @Test
-    public void test_fromTagValue() {
+    void testFromTagValue() {
 
         TurnRestrictionType type = TurnRestrictionType.fromTagValue("no_left_turn");
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditorTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditorTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditorTest.java	(revision 36064)
@@ -7,5 +7,5 @@
 import javax.swing.JFrame;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -16,5 +16,5 @@
  *
  */
-@Ignore("no test")
+@Disabled("no test")
 public class VehicleExceptionEditorTest extends JFrame {
     TurnRestrictionEditorModel model;
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListTest.java	(revision 36064)
@@ -11,5 +11,5 @@
 import javax.swing.JList;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -23,5 +23,5 @@
  *
  */
-@Ignore("no test")
+@Disabled("no test")
 public class ViaListTest extends JFrame {
 
Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesViewTest.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesViewTest.java	(revision 36062)
+++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesViewTest.java	(revision 36064)
@@ -11,5 +11,5 @@
 import javax.swing.JScrollPane;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -20,5 +20,5 @@
  * Simple test application for layout and functionality of the issues view.
  */
-@Ignore("no test")
+@Disabled("no test")
 public class IssuesViewTest extends JFrame {
     private IssuesModel model;