Index: trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 11933)
+++ trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 11943)
@@ -22,4 +22,5 @@
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -111,5 +112,5 @@
             CertificateAmendment.addMissingCertificates();
         } catch (IOException | GeneralSecurityException ex) {
-            throw new RuntimeException(ex);
+            throw new JosmRuntimeException(ex);
         }
 
Index: trunk/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java	(revision 11933)
+++ trunk/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java	(revision 11943)
@@ -26,5 +26,5 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    public JOSMTestRules test = new JOSMTestRules().platform().https();
 
     /**
@@ -82,4 +82,13 @@
     }
 
+    /**
+     * Test Dutch government.
+     * @throws IOException in case of I/O error
+     */
+    @Test
+    public void testDutchGovernment() throws IOException {
+        connect("https://geodata.nationaalgeoregister.nl", true);
+    }
+
     private static void connect(String url, boolean shouldWork) throws IOException {
         URLConnection connection = new URL(url).openConnection();
Index: trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 11933)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 11943)
@@ -4,4 +4,5 @@
 import java.io.File;
 import java.io.IOException;
+import java.security.GeneralSecurityException;
 import java.text.MessageFormat;
 import java.util.TimeZone;
@@ -17,8 +18,10 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.CertificateAmendment;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmApiInitializationException;
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MemoryManagerTest;
@@ -46,4 +49,5 @@
     private boolean allowMemoryManagerLeaks;
     private boolean useMapStyles;
+    private boolean useHttps;
 
     /**
@@ -137,4 +141,13 @@
     public JOSMTestRules projection() {
         useProjection = true;
+        return this;
+    }
+
+    /**
+     * Set up HTTPS certificates
+     * @return this instance, for easy chaining
+     */
+    public JOSMTestRules https() {
+        useHttps = true;
         return this;
     }
@@ -222,4 +235,17 @@
         }
 
+        // Set Platform
+        if (platform) {
+            Main.determinePlatformHook();
+        }
+
+        if (useHttps) {
+            try {
+                CertificateAmendment.addMissingCertificates();
+            } catch (IOException | GeneralSecurityException ex) {
+                throw new JosmRuntimeException(ex);
+            }
+        }
+
         if (useProjection) {
             Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
@@ -241,9 +267,4 @@
                 throw new InitializationError(e);
             }
-        }
-
-        // Set Platform
-        if (platform) {
-            Main.determinePlatformHook();
         }