diff --git a/asm-util/src/test/java/org/objectweb/asm/util/TextifierTest.java b/asm-util/src/test/java/org/objectweb/asm/util/TextifierTest.java
index 053c78d0a7cbf73e8b9b57546f8313e990d56031..e010c6163cfef7e4592459d874b54380b05f4bd9 100644
--- a/asm-util/src/test/java/org/objectweb/asm/util/TextifierTest.java
+++ b/asm-util/src/test/java/org/objectweb/asm/util/TextifierTest.java
@@ -35,6 +35,7 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
@@ -121,8 +122,10 @@ public class TextifierTest extends AsmTest {
 
     String expectedText =
         new String(
-            Files.readAllBytes(
-                Paths.get("src/test/resources/" + classParameter.getName() + ".txt")));
+                Files.readAllBytes(
+                    Paths.get("src/test/resources/" + classParameter.getName() + ".txt")),
+                StandardCharsets.UTF_8)
+            .replace("\r", "");
     assertEquals(expectedText, stringWriter.toString());
   }
 }
diff --git a/build.gradle b/build.gradle
index 76165395b8475986e54e04b992af7159e35ec6d0..fccbb47df7c6529b0794d1ef648c28e88a7e0539 100644
--- a/build.gradle
+++ b/build.gradle
@@ -226,9 +226,9 @@ configure(subprojects.findAll { it.provides }) {
         classpath configurations.sigtest
         main 'com.sun.tdk.signaturetest.Main'
         args 'Test', '-ApiVersion', version, '-Backward', '-Static', '-Mode',
-            'bin', '-Classpath', "${System.env.JAVA_HOME}/jre/lib/rt.jar:" +
-            sourceSets.main.output.classesDirs.asPath, '-FileName', f,
-            '-Out', outputs.getFiles()[0], '-Package'
+            'bin', '-Classpath', "${System.env.JAVA_HOME}/jre/lib/rt.jar" +
+            File.pathSeparator + sourceSets.main.output.classesDirs.asPath,
+            '-FileName', f, '-Out', outputs.getFiles()[0], '-Package'
         args provides
         // The exit value is not 0 in case of success, but 95...
         ignoreExitValue true
@@ -271,6 +271,9 @@ configure(subprojects.findAll { it.provides }) {
   // Apply the SonarQube plugin to monitor the code quality of the project.
   // Use with 'gradlew sonarqube -Dsonar.host.url=https://sonarqube.ow2.org'.
   apply plugin: 'org.sonarqube'
+  sonarqube {
+    properties { property 'sonar.projectKey', "ASM:${project.name}" }
+  }
 
   // Add a task to generate a private javadoc and add it as a dependency of the
   // 'check' task.
diff --git a/settings.gradle b/settings.gradle
index 63daffd9d525c4a958e8bd95def3170dc9decfa9..2a5903bbcf0dda75d59093bff19c891b32d15f38 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -26,7 +26,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 // THE POSSIBILITY OF SUCH DAMAGE.
 
-rootProject.name = 'ASM'
+rootProject.name = 'root'
 
 include(
   'asm',