Index: unk/appveyor.yml
===================================================================
--- /trunk/appveyor.yml	(revision 17696)
+++ 	(revision )
@@ -1,25 +1,0 @@
-version: '{build}'
-image: Visual Studio 2017
-install:
-  - cinst ant
-  - refreshenv
-build_script:
-  - ant compile dist distmac checkstyle pmd spotbugs
-test_script:
-  - ant test-unit-hardfail
-on_finish:
-  - ps: |
-        $wc = New-Object 'System.Net.WebClient'
-        Get-ChildItem . -Name -Recurse 'TEST-*.xml'  |
-        Foreach-Object {
-            $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $_))
-        }
-  # we want to push test result artifact even if the tests fail, so uploading manually
-  - 7z a test-results.zip test\report\TEST*.xml
-  - ps: Push-AppveyorArtifact test-results.zip
-artifacts:
-  - path: dist\josm-custom.*
-  - path: checkstyle-josm.xml
-  - path: pmd-josm.xml
-  - path: spotbugs-josm.xml
-  - path: hs_err_pid*.log
Index: /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java	(revision 17696)
+++ /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java	(revision 17697)
@@ -12,5 +12,4 @@
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
-import java.security.KeyStore.TrustedCertificateEntry;
 import java.util.stream.Collectors;
 
@@ -19,13 +18,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.openstreetmap.josm.tools.PlatformHookWindows;
-import org.openstreetmap.josm.tools.PlatformManager;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import mockit.Mock;
-import mockit.MockUp;
 
 /**
@@ -35,11 +29,4 @@
 
     private String httpBase;
-
-    private static class PlatformHookWindowsMock extends MockUp<PlatformHookWindows> {
-        @Mock
-        public boolean setupHttpsCertificate(String entryAlias, TrustedCertificateEntry trustedCert) {
-            return true;
-        }
-    }
 
     /**
@@ -56,10 +43,4 @@
     @BeforeEach
     public void setUp() throws GeneralSecurityException {
-        if (PlatformManager.isPlatformWindows() && "True".equals(System.getenv("APPVEYOR"))) {
-            // appveyor doesn't like us tinkering with the root keystore, so mock this out
-            TestUtils.assumeWorkingJMockit();
-            new PlatformHookWindowsMock();
-        }
-
         RemoteControl.start();
         httpBase = "http://127.0.0.1:"+Config.getPref().getInt("remote.control.port", 8111);