diff --git a/.appveyor.yml b/.appveyor.yml
index 52fe5b6c0ddd..91e0752a7d75 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,9 +6,12 @@ branches:
     - /^r\d.*$/
 
 install:
-  - cinst jdk10 -params 'installdir=C:\\jdk10'
-  - SET JAVA_HOME=C:\jdk10
-  - SET PATH=C:\jdk10\bin;%PATH%
+# JDK installation via: https://chocolatey.org/packages/jdk11
+  - cinst jdk11 -params 'installdir=C:\\jdk11'
+  - SET JAVA_HOME="C:\jdk11"
+# Or use pre-installed JDK
+#  - SET JAVA_HOME="C:\Program Files\Java\jdk10"
+  - SET PATH=%JAVA_HOME%\bin;%PATH%
 
 test_script:
   - gradlew --no-daemon -version
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
index 58a5b5b35814..4808c8bfccaa 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
@@ -2,7 +2,7 @@
 
 org.junit.jupiter.engine@${jupiterVersion} automatic
 requires java.base mandated
-provides org.junit.platform.engine.TestEngine with org.junit.jupiter.engine.JupiterTestEngine
+provides org.junit.platform.engine.TestEngine with org.junit.jupiter.engine.[J|j]upiter[T|t]est[E|e]ngine
 contains org.junit.jupiter.engine
 contains org.junit.jupiter.engine.descriptor
 contains org.junit.jupiter.engine.discovery
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-surefire-provider.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-surefire-provider.expected.txt
index 4561ba1e93e9..28dd5e935b54 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-surefire-provider.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-surefire-provider.expected.txt
@@ -2,5 +2,5 @@
 
 org.junit.platform.surefire.provider@${platformVersion} automatic
 requires java.base mandated
-provides org.apache.maven.surefire.providerapi.SurefireProvider with org.junit.platform.surefire.provider.JUnitPlatformProvider
+provides org.apache.maven.surefire.providerapi.SurefireProvider with org.junit.platform.surefire.provider.[J|j][U|u]nit[P|p]latform[P|p]rovider
 contains org.junit.platform.surefire.provider
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
index c93a0c8412b7..6ad8876ffc0f 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
@@ -2,7 +2,7 @@
 
 org.junit.vintage.engine@${vintageVersion} automatic
 requires java.base mandated
-provides org.junit.platform.engine.TestEngine with org.junit.vintage.engine.VintageTestEngine
+provides org.junit.platform.engine.TestEngine with org.junit.vintage.engine.[V|v]intage[T|t]est[E|e]ngine
 contains org.junit.vintage.engine
 contains org.junit.vintage.engine.descriptor
 contains org.junit.vintage.engine.discovery