diff --git a/buildSrc/src/main/kotlin/com/facebook/ktfmt/NativeImagePlugin.kt b/buildSrc/src/main/kotlin/com/facebook/ktfmt/NativeImagePlugin.kt
index 7231ea3b..dd45a6d7 100644
--- a/buildSrc/src/main/kotlin/com/facebook/ktfmt/NativeImagePlugin.kt
+++ b/buildSrc/src/main/kotlin/com/facebook/ktfmt/NativeImagePlugin.kt
@@ -62,7 +62,7 @@ class NativeImagePlugin : Plugin<Project> {
     val nativeImageDir = project.layout.projectDirectory.dir(NATIVE_IMAGE_SRC_DIR)
     val javaExtension = project.extensions.getByType<JavaPluginExtension>()
     val nativeImageSourceSet =
-        javaExtension.sourceSets.create("nativeImage") {
+        javaExtension.sourceSets.create("nativeImageSourceSet") {
           java.srcDir(nativeImageDir.dir("java"))
           resources.srcDir(nativeImageDir.dir("resources"))
         }
diff --git a/core/src/test/java/com/facebook/ktfmt/cli/MainTest.kt b/core/src/test/java/com/facebook/ktfmt/cli/MainTest.kt
index fda20225..4d08a796 100644
--- a/core/src/test/java/com/facebook/ktfmt/cli/MainTest.kt
+++ b/core/src/test/java/com/facebook/ktfmt/cli/MainTest.kt
@@ -349,7 +349,7 @@ class MainTest {
         .run()
 
     assertThat(out.toString(UTF_8)).doesNotContain("hello, world")
-    assertThat(out.toString(testCharset)).isEqualTo("<stdin>\n")
+    assertThat(out.toString(testCharset)).isEqualTo("<stdin>${System.lineSeparator()}")
   }
 
   @Test
@@ -460,7 +460,7 @@ class MainTest {
         .run()
 
     assertThat(out.toString(UTF_8)).doesNotContain("hello, world")
-    assertThat(out.toString(testCharset)).isEqualTo("<stdin>\n")
+    assertThat(out.toString(testCharset)).isEqualTo("<stdin>${System.lineSeparator()}")
     assertThat(exitCode).isEqualTo(1)
   }
 
diff --git a/core/src/test/java/com/facebook/ktfmt/cli/ParsedArgsTest.kt b/core/src/test/java/com/facebook/ktfmt/cli/ParsedArgsTest.kt
index 6e691b80..9ff57e06 100644
--- a/core/src/test/java/com/facebook/ktfmt/cli/ParsedArgsTest.kt
+++ b/core/src/test/java/com/facebook/ktfmt/cli/ParsedArgsTest.kt
@@ -287,7 +287,7 @@ class ParsedArgsTest {
         assertFailsWith<FileNotFoundException> {
           ParsedArgs.processArgs(arrayOf("@non-existing-file"))
         }
-    assertThat(e.message).contains("non-existing-file (No such file or directory)")
+    assertThat(e.message).contains("non-existing-file")
   }
 
   @Test
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6514f919..1adfd2e5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME