diff --git a/build.gradle.kts b/build.gradle.kts
index 79b1e7fa1..bf4729593 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,7 +29,7 @@ dokka { dokkaPublications.html { outputDirectory = rootDir.resolve("docs/api") }
 
 kotlin {
   explicitApi()
-  @OptIn(ExperimentalAbiValidation::class) abiValidation { enabled = true }
+  @OptIn(ExperimentalAbiValidation::class) abiValidation()
   val jdkRelease = "17"
   compilerOptions {
     allWarningsAsErrors = true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bcc94c0a2..33ab89644 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 minGradle = "9.0.0"
-kotlin = "2.3.20"
+kotlin = "2.4.0-Beta2"
 moshi = "1.15.2"
 pluginPublish = "2.1.1"
 
diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/KotlinPluginsTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/KotlinPluginsTest.kt
index 84b763e4a..be9281630 100644
--- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/KotlinPluginsTest.kt
+++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/KotlinPluginsTest.kt
@@ -47,7 +47,13 @@ class KotlinPluginsTest : BasePluginTest() {
 
     assertThat(outputShadowedJar).useAll {
       val entries =
-        arrayOf("my/", "META-INF/my.kotlin_module", mainClassEntry, *junitEntries, *manifestEntries)
+        arrayOf(
+          "my/",
+          "META-INF/my_my.kotlin_module",
+          mainClassEntry,
+          *junitEntries,
+          *manifestEntries,
+        )
       if (excludeStdlib) {
         containsOnly(*entries)
       } else {
@@ -88,7 +94,13 @@ class KotlinPluginsTest : BasePluginTest() {
 
     assertThat(outputShadowedJar).useAll {
       val entries =
-        arrayOf("my/", "META-INF/my.kotlin_module", mainClassEntry, *entriesInAB, *manifestEntries)
+        arrayOf(
+          "my/",
+          "META-INF/my_my.kotlin_module",
+          mainClassEntry,
+          *entriesInAB,
+          *manifestEntries,
+        )
       if (excludeStdlib) {
         containsOnly(*entries)
       } else {
@@ -129,8 +141,7 @@ class KotlinPluginsTest : BasePluginTest() {
     runWithSuccess(shadowJarPath)
 
     assertThat(outputShadowedJar).useAll {
-      val entries =
-        arrayOf("my/", "META-INF/my.kotlin_module", mainClassEntry, *entriesInAB, *manifestEntries)
+      val entries = arrayOf("my/", mainClassEntry, *entriesInAB, *manifestEntries)
       containsAtLeast(*entries)
     }
   }