Index: applications/viewer/jmapviewer/test/org/openstreetmap/gui/jmapviewer/TileRangeTest.java
===================================================================
--- applications/viewer/jmapviewer/test/org/openstreetmap/gui/jmapviewer/TileRangeTest.java	(revision 35527)
+++ applications/viewer/jmapviewer/test/org/openstreetmap/gui/jmapviewer/TileRangeTest.java	(revision 36140)
@@ -2,12 +2,13 @@
 package org.openstreetmap.gui.jmapviewer;
 
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests of {@link TileRange} class.
  */
-public class TileRangeTest {
+class TileRangeTest {
 
     /**
@@ -15,5 +16,5 @@
      */
     @Test
-    public void testSize() {
+    void testSize() {
         assertEquals(16, new TileRange(
                 new TileXY(3, 3), 
Index: applications/viewer/jmapviewer/test/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSourceTest.java
===================================================================
--- applications/viewer/jmapviewer/test/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSourceTest.java	(revision 35527)
+++ applications/viewer/jmapviewer/test/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSourceTest.java	(revision 36140)
@@ -2,6 +2,6 @@
 package org.openstreetmap.gui.jmapviewer.tilesources;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.text.MessageFormat;
@@ -11,5 +11,5 @@
 import java.util.stream.Stream;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
@@ -49,5 +49,5 @@
      */
     @Test
-    public void testGetTileUrl() {
+    void testGetTileUrl() {
         checkGetTileUrl(
                 "http://localhost/{z}/{x}/{y}",
@@ -61,5 +61,5 @@
      */
     @Test
-    public void testGetTileUrl_positive_zoom() {
+    void testGetTileUrl_positive_zoom() {
         checkGetTileUrl(
                 "http://localhost/{zoom+5}/{x}/{y}",
@@ -73,5 +73,5 @@
      */
     @Test
-    public void testGetTileUrl_negative_zoom() {
+    void testGetTileUrl_negative_zoom() {
         checkGetTileUrl(
                 "http://localhost/{zoom-5}/{x}/{y}",
@@ -85,5 +85,5 @@
      */
     @Test
-    public void testGetTileUrl_inverse_negative_zoom() {
+    void testGetTileUrl_inverse_negative_zoom() {
         checkGetTileUrl(
                 "http://localhost/{5-zoom}/{x}/{y}",
@@ -97,5 +97,5 @@
      */
     @Test
-    public void testGetTileUrl_both_offsets() {
+    void testGetTileUrl_both_offsets() {
         checkGetTileUrl(
                 "http://localhost/{10-zoom-5}/{x}/{y}",
@@ -109,5 +109,5 @@
      */
     @Test
-    public void testGetTileUrl_apiKey() {
+    void testGetTileUrl_apiKey() {
         System.setProperty("id1.api-key", "wololo");
         TileSourceInfo testImageryTMS = new TileSourceInfo("test imagery", "http://localhost/{zoom}/{x}/{y}?token={apikey}&foo=bar", "id1");
@@ -120,5 +120,5 @@
      */
     @Test
-    public void testGetTileUrl_switch() {
+    void testGetTileUrl_switch() {
         TileSourceInfo testImageryTMS = new TileSourceInfo("test imagery", "http://{switch:a,b,c}.localhost/{10-zoom-5}/{x}/{y}", "id1");
         TemplatedTMSTileSource ts = new TemplatedTMSTileSource(testImageryTMS);
@@ -159,5 +159,5 @@
 
     @Test
-    public void testGetTileUrl_yahoo() {
+    void testGetTileUrl_yahoo() {
         checkGetTileUrl(
                 "http://localhost/{z}/{x}/{!y}",
@@ -169,5 +169,5 @@
 
     @Test
-    public void testGetTileUrl_negative_y() {
+    void testGetTileUrl_negative_y() {
         checkGetTileUrl(
                 "http://localhost/{z}/{x}/{-y}",
@@ -189,5 +189,5 @@
      */
     @Test
-    public void testAllUrls() {
+    void testAllUrls() {
         for (String[] test: TEST_DATA) {
             TileSourceInfo testImageryTMS = new TileSourceInfo("test imagery", test[0], "id1");