Index: applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/FullGraphCreationTest.java
===================================================================
--- applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/FullGraphCreationTest.java	(revision 32620)
+++ applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/FullGraphCreationTest.java	(revision 36064)
@@ -2,8 +2,10 @@
 package org.openstreetmap.josm.plugins.graphview.core;
 
-import static org.junit.Assert.assertSame;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -12,5 +14,5 @@
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.plugins.graphview.core.TestDataSource.TestNode;
 import org.openstreetmap.josm.plugins.graphview.core.TestDataSource.TestRelation;
@@ -33,5 +35,5 @@
 import org.openstreetmap.josm.plugins.graphview.plugin.preferences.VehiclePropertyStringParser.PropertyValueSyntaxException;
 
-public class FullGraphCreationTest {
+class FullGraphCreationTest {
 
     private static final AccessParameters ACCESS_PARAMS;
@@ -44,5 +46,5 @@
             ACCESS_PARAMS = new PreferenceAccessParameters(
                     "test_vehicle",
-                    Arrays.asList(AccessType.UNDEFINED),
+                    Collections.singletonList(AccessType.UNDEFINED),
                     vehiclePropertyValues);
         } catch (PropertyValueSyntaxException e) {
@@ -54,10 +56,10 @@
         @Override
         public java.util.List<String> getAccessHierarchyAncestors(String transportMode) {
-            return Arrays.asList(transportMode);
+            return Collections.singletonList(transportMode);
         }
 
         @Override
         public Collection<Tag> getBaseTags() {
-            return Arrays.asList(new Tag("highway", "test"));
+            return Collections.singletonList(new Tag("highway", "test"));
         }
 
@@ -69,5 +71,5 @@
 
     @Test
-    public void testTJunction() {
+    void testTJunction() {
 
         TestDataSource ds = new TestDataSource();
@@ -125,5 +127,5 @@
 
     @Test
-    public void testBarrier() {
+    void testBarrier() {
 
         TestDataSource ds = new TestDataSource();
Index: applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReaderTest.java
===================================================================
--- applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReaderTest.java	(revision 32620)
+++ applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReaderTest.java	(revision 36064)
@@ -2,9 +2,9 @@
 package org.openstreetmap.josm.plugins.graphview.core.access;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-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.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.FileInputStream;
@@ -15,5 +15,5 @@
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.plugins.graphview.core.data.MapBasedTagGroup;
@@ -21,8 +21,8 @@
 import org.openstreetmap.josm.plugins.graphview.core.data.TagGroup;
 
-public class AccessRulesetReaderTest {
+class AccessRulesetReaderTest {
 
     @Test
-    public void testReadAccessRuleset_valid_classes() throws IOException {
+    void testReadAccessRulesetValidClasses() throws IOException {
 
         InputStream is = new FileInputStream(TestUtils.getTestDataRoot()+"accessRuleset_valid.xml");
@@ -50,5 +50,5 @@
 
     @Test
-    public void testReadAccessRuleset_valid_basetags() throws IOException {
+    void testReadAccessRulesetValidBasetags() throws IOException {
 
         InputStream is = new FileInputStream(TestUtils.getTestDataRoot()+"accessRuleset_valid.xml");
@@ -66,5 +66,5 @@
 
     @Test
-    public void testReadAccessRuleset_valid_implications() throws IOException {
+    void testReadAccessRulesetValidImplications() throws IOException {
 
         InputStream is = new FileInputStream(TestUtils.getTestDataRoot()+"accessRuleset_valid.xml");
Index: applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/property/RoadInclineTest.java
===================================================================
--- applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/property/RoadInclineTest.java	(revision 32620)
+++ applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/property/RoadInclineTest.java	(revision 36064)
@@ -2,13 +2,13 @@
 package org.openstreetmap.josm.plugins.graphview.core.property;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.plugins.graphview.core.data.Tag;
 
-public class RoadInclineTest extends RoadPropertyTest {
+class RoadInclineTest implements RoadPropertyTest {
 
     private static void testIncline(Float expectedInclineForward, Float expectedInclineBackward,
             String inclineString) {
 
-        testEvaluateW(new RoadIncline(),
+        RoadPropertyTest.testEvaluateW(new RoadIncline(),
                 expectedInclineForward, expectedInclineBackward,
                 new Tag("incline", inclineString));
@@ -16,5 +16,5 @@
 
     @Test
-    public void testEvaluate() {
+    void testEvaluate() {
         testIncline(5f, -5f, "5 %");
         testIncline(9.5f, -9.5f, "9.5 %");
Index: applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/property/RoadMaxspeedTest.java
===================================================================
--- applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/property/RoadMaxspeedTest.java	(revision 32620)
+++ applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/property/RoadMaxspeedTest.java	(revision 36064)
@@ -2,15 +2,15 @@
 package org.openstreetmap.josm.plugins.graphview.core.property;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.plugins.graphview.core.data.Tag;
 
-public class RoadMaxspeedTest extends RoadPropertyTest {
+class RoadMaxspeedTest implements RoadPropertyTest {
 
     private static void testMaxspeed(float expectedMaxspeed, String maxspeedString) {
-        testEvaluateBoth(new RoadMaxspeed(), expectedMaxspeed, new Tag("maxspeed", maxspeedString));
+        RoadPropertyTest.testEvaluateBoth(new RoadMaxspeed(), expectedMaxspeed, new Tag("maxspeed", maxspeedString));
     }
 
     @Test
-    public void testEvaluate_numeric() {
+    void testEvaluateNumeric() {
         testMaxspeed(30, "30");
         testMaxspeed(48.3f, "48.3");
@@ -18,5 +18,5 @@
 
     @Test
-    public void testEvaluate_kmh() {
+    void testEvaluateKmh() {
         testMaxspeed(50, "50 km/h");
         testMaxspeed(120, "120km/h");
@@ -25,5 +25,5 @@
 
     @Test
-    public void testEvaluate_mph() {
+    void testEvaluateMph() {
         testMaxspeed(72.42048f, "45 mph");
         testMaxspeed(64.373764f, "40mph");
Index: applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/property/RoadPropertyTest.java
===================================================================
--- applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/property/RoadPropertyTest.java	(revision 32620)
+++ applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/property/RoadPropertyTest.java	(revision 36064)
@@ -2,14 +2,12 @@
 package org.openstreetmap.josm.plugins.graphview.core.property;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Ignore;
 import org.openstreetmap.josm.plugins.graphview.core.TestDataSource;
 import org.openstreetmap.josm.plugins.graphview.core.data.Tag;
 
-@Ignore("no test")
-public abstract class RoadPropertyTest {
+public interface RoadPropertyTest {
 
-    protected static <P> void testEvaluateW(RoadPropertyType<P> property, P expectedForward, P expectedBackward, Tag... wayTags) {
+    static <P> void testEvaluateW(RoadPropertyType<P> property, P expectedForward, P expectedBackward, Tag... wayTags) {
 
         TestDataSource ds = new TestDataSource();
@@ -25,5 +23,5 @@
     }
 
-    protected static <P> void testEvaluateN(RoadPropertyType<P> property, P expected, Tag... nodeTags) {
+    static <P> void testEvaluateN(RoadPropertyType<P> property, P expected, Tag... nodeTags) {
 
         TestDataSource ds = new TestDataSource();
@@ -40,5 +38,5 @@
     }
 
-    protected static <P> void testEvaluateBoth(RoadPropertyType<P> property, P expected, Tag... nodeTags) {
+    static <P> void testEvaluateBoth(RoadPropertyType<P> property, P expected, Tag... nodeTags) {
         testEvaluateW(property, expected, expected, nodeTags);
         testEvaluateN(property, expected, nodeTags);
Index: applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogicTest.java
===================================================================
--- applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogicTest.java	(revision 32620)
+++ applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogicTest.java	(revision 36064)
@@ -1,24 +1,26 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.graphview.core.util;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.plugins.graphview.core.data.MapBasedTagGroup;
 import org.openstreetmap.josm.plugins.graphview.core.data.Tag;
 import org.openstreetmap.josm.plugins.graphview.core.data.TagGroup;
 
-public class TagConditionLogicTest {
+class TagConditionLogicTest {
 
     TagGroup groupA;
     TagGroup groupB;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         Map<String, String> mapA = new HashMap<>();
         mapA.put("key1", "value1");
@@ -34,5 +36,5 @@
 
     @Test
-    public void testTag() {
+    void testTag() {
         TagCondition condition = TagConditionLogic.tag(new Tag("key3", "value1"));
         assertTrue(condition.matches(groupA));
@@ -41,5 +43,5 @@
 
     @Test
-    public void testKey() {
+    void testKey() {
         TagCondition condition = TagConditionLogic.key("key3");
         assertTrue(condition.matches(groupA));
@@ -48,8 +50,8 @@
 
     @Test
-    public void testAnd() {
+    void testAnd() {
         TagCondition condition1 = TagConditionLogic.tag(new Tag("key2", "value2"));
         TagCondition conditionAnd1a = TagConditionLogic.and(condition1);
-        TagCondition conditionAnd1b = TagConditionLogic.and(Arrays.asList(condition1));
+        TagCondition conditionAnd1b = TagConditionLogic.and(Collections.singletonList(condition1));
 
         assertTrue(conditionAnd1a.matches(groupA));
@@ -78,8 +80,8 @@
 
     @Test
-    public void testOr() {
+    void testOr() {
         TagCondition condition1 = TagConditionLogic.tag(new Tag("key42", "value42"));
         TagCondition conditionOr1a = TagConditionLogic.or(condition1);
-        TagCondition conditionOr1b = TagConditionLogic.or(Arrays.asList(condition1));
+        TagCondition conditionOr1b = TagConditionLogic.or(Collections.singletonList(condition1));
 
         assertFalse(conditionOr1a.matches(groupA));
@@ -108,5 +110,5 @@
 
     @Test
-    public void testNot() {
+    void testNot() {
         TagCondition condition = TagConditionLogic.not(TagConditionLogic.key("key3"));
         assertFalse(condition.matches(groupA));
Index: applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/util/ValueStringParserTest.java
===================================================================
--- applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/util/ValueStringParserTest.java	(revision 32620)
+++ applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/util/ValueStringParserTest.java	(revision 36064)
@@ -2,22 +2,23 @@
 package org.openstreetmap.josm.plugins.graphview.core.util;
 
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.openstreetmap.josm.plugins.graphview.core.util.ValueStringParser.parseMeasure;
 import static org.openstreetmap.josm.plugins.graphview.core.util.ValueStringParser.parseSpeed;
 import static org.openstreetmap.josm.plugins.graphview.core.util.ValueStringParser.parseWeight;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ValueStringParserTest {
+
+class ValueStringParserTest {
 
     /* speed */
 
     @Test
-    public void testParseSpeedDefault() {
+    void testParseSpeedDefault() {
         assertClose(50, parseSpeed("50"));
     }
 
     @Test
-    public void testParseSpeedKmh() {
+    void testParseSpeedKmh() {
         assertClose(30, parseSpeed("30 km/h"));
         assertClose(100, parseSpeed("100km/h"));
@@ -25,5 +26,5 @@
 
     @Test
-    public void testParseSpeedMph() {
+    void testParseSpeedMph() {
         assertClose(40.234f, parseSpeed("25mph"));
         assertClose(40.234f, parseSpeed("25 mph"));
@@ -31,5 +32,5 @@
 
     @Test
-    public void testParseSpeedInvalid() {
+    void testParseSpeedInvalid() {
         assertNull(parseSpeed("lightspeed"));
     }
@@ -38,10 +39,10 @@
 
     @Test
-    public void testParseMeasureDefault() {
+    void testParseMeasureDefault() {
         assertClose(3.5f, parseMeasure("3.5"));
     }
 
     @Test
-    public void testParseMeasureM() {
+    void testParseMeasureM() {
         assertClose(2, parseMeasure("2m"));
         assertClose(5.5f, parseMeasure("5.5 m"));
@@ -49,5 +50,5 @@
 
     @Test
-    public void testParseMeasureKm() {
+    void testParseMeasureKm() {
         assertClose(1000, parseMeasure("1 km"));
         assertClose(7200, parseMeasure("7.2km"));
@@ -55,10 +56,10 @@
 
     @Test
-    public void testParseMeasureMi() {
+    void testParseMeasureMi() {
         assertClose(1609.344f, parseMeasure("1 mi"));
     }
 
     @Test
-    public void testParseMeasureFeetInches() {
+    void testParseMeasureFeetInches() {
         assertClose(3.6576f, parseMeasure("12'0\""));
         assertClose(1.9812f, parseMeasure("6' 6\""));
@@ -66,5 +67,5 @@
 
     @Test
-    public void testParseMeasureInvalid() {
+    void testParseMeasureInvalid() {
         assertNull(parseMeasure("very long"));
         assertNull(parseMeasure("6' 16\""));
@@ -74,10 +75,10 @@
 
     @Test
-    public void testParseWeightDefault() {
+    void testParseWeightDefault() {
         assertClose(3.6f, parseWeight("3.6"));
     }
 
     @Test
-    public void testParseWeightT() {
+    void testParseWeightT() {
         assertClose(30, parseWeight("30t"));
         assertClose(3.5f, parseWeight("3.5 t"));
@@ -85,5 +86,5 @@
 
     @Test
-    public void testParseWeightInvalid() {
+    void testParseWeightInvalid() {
         assertNull(parseWeight("heavy"));
     }
Index: applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/visualisation/FloatPropertyColorSchemeTest.java
===================================================================
--- applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/visualisation/FloatPropertyColorSchemeTest.java	(revision 32620)
+++ applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/visualisation/FloatPropertyColorSchemeTest.java	(revision 36064)
@@ -2,5 +2,5 @@
 package org.openstreetmap.josm.plugins.graphview.core.visualisation;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.Color;
@@ -8,13 +8,13 @@
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.plugins.graphview.core.property.RoadMaxweight;
 
-public class FloatPropertyColorSchemeTest {
+class FloatPropertyColorSchemeTest {
 
     private FloatPropertyColorScheme subject;
 
-    @Before
+    @BeforeEach
     public void setUp() {
 
@@ -28,5 +28,5 @@
 
     @Test
-    public void testGetColorForValue_below() {
+    void testGetColorForValueBelow() {
         assertEquals(new Color(42, 42, 42), subject.getColorForValue(1f));
         assertEquals(new Color(42, 42, 42), subject.getColorForValue(5f));
@@ -34,15 +34,15 @@
 
     @Test
-    public void testGetColorForValue_above() {
+    void testGetColorForValueAbove() {
         assertEquals(new Color(200, 200, 200), subject.getColorForValue(25f));
     }
 
     @Test
-    public void testGetColorForValue_value() {
+    void testGetColorForValueValue() {
         assertEquals(new Color(100, 100, 100), subject.getColorForValue(10f));
     }
 
     @Test
-    public void testGetColorForValue_interpolate() {
+    void testGetColorForValueInterpolate() {
         assertEquals(new Color(150, 150, 150), subject.getColorForValue(15f));
     }