diff --git a/community/dbms/src/test/java/org/neo4j/commandline/dbms/DiagnosticsReportCommandTest.java b/community/dbms/src/test/java/org/neo4j/commandline/dbms/DiagnosticsReportCommandTest.java
index 1c9ed2b8d4a6..e2727727c928 100644
--- a/community/dbms/src/test/java/org/neo4j/commandline/dbms/DiagnosticsReportCommandTest.java
+++ b/community/dbms/src/test/java/org/neo4j/commandline/dbms/DiagnosticsReportCommandTest.java
@@ -23,6 +23,7 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.jupiter.api.condition.JRE;
 import org.junit.rules.ExpectedException;
 
 import java.io.ByteArrayOutputStream;
@@ -206,7 +207,9 @@ public void listShouldDisplayAllClassifiers() throws Exception
     @Test
     public void overrideDestination() throws Exception
     {
-        String[] args = {"--to=other/", "all"};
+        // because of https://bugs.openjdk.java.net/browse/JDK-8202127 and current surefire behaviour we need to have custom value for JRE >= 11
+        String toArgument = JRE.JAVA_11.isCurrentVersion() ? "--to=" + System.getProperty( "user.dir" ) + "/other/" : "--to=other/";
+        String[] args = {toArgument, "all"};
         try ( RealOutsideWorld outsideWorld = new RealOutsideWorld() )
         {
             DiagnosticsReportCommand
diff --git a/community/procedure-compiler/processor/src/test/java/org/neo4j/tooling/procedure/visitors/UserFunctionVisitorTest.java b/community/procedure-compiler/processor/src/test/java/org/neo4j/tooling/procedure/visitors/UserFunctionVisitorTest.java
index 1cfe2bcf8366..7cf43a38fe2e 100644
--- a/community/procedure-compiler/processor/src/test/java/org/neo4j/tooling/procedure/visitors/UserFunctionVisitorTest.java
+++ b/community/procedure-compiler/processor/src/test/java/org/neo4j/tooling/procedure/visitors/UserFunctionVisitorTest.java
@@ -23,6 +23,7 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.jupiter.api.condition.JRE;
 
 import java.util.stream.Stream;
 import javax.lang.model.element.Element;
@@ -128,8 +129,9 @@ public void functions_with_non_annotated_parameters_are_invalid()
 
         Stream<CompilationMessage> errors = visitor.visit( function );
 
+        String errorMessage = JRE.JAVA_11.isCurrentVersion() ? "@org.neo4j.procedure.Name usage error: missing on parameter <oops>"
+                                                             : "@org.neo4j.procedure.Name usage error: missing on parameter <arg1>";
         assertThat( errors ).hasSize( 1 ).extracting( CompilationMessage::getCategory, CompilationMessage::getContents )
-                .contains( tuple( Diagnostic.Kind.ERROR,
-                        "@org.neo4j.procedure.Name usage error: missing on parameter <arg1>" ) );
+                .contains( tuple( Diagnostic.Kind.ERROR, errorMessage ) );
     }
 }
diff --git a/pom.xml b/pom.xml
index 73030cc46b41..b1f11d210de0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
     <scala-maven-plugin.version>3.3.2</scala-maven-plugin.version>
     <scala.version>2.11.12</scala.version>
     <scala.binary.version>2.11</scala.binary.version>
-    <asm.version>6.1.1</asm.version>
+    <asm.version>6.2</asm.version>
     <metrics.version>4.0.2</metrics.version>
     <scala.target.vm>1.8</scala.target.vm>
     <scala.java.additional.args/>
@@ -935,7 +935,7 @@
         <jdk>[9, )</jdk>
       </activation>
       <properties>
-        <java.exports>--add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-modules java.xml.bind</java.exports>
+        <java.exports>--add-exports=java.base/sun.nio.ch=ALL-UNNAMED</java.exports>
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <scala.java.additional.args>-nobootcp</scala.java.additional.args>
       </properties>