diff --git a/functional-tests/src/test/groovy/io/micronaut/gradle/openapi/OpenApiServerWithKotlinSpec.groovy b/functional-tests/src/test/groovy/io/micronaut/gradle/openapi/OpenApiServerWithKotlinSpec.groovy
index 92e8818a..c9d4ae92 100644
--- a/functional-tests/src/test/groovy/io/micronaut/gradle/openapi/OpenApiServerWithKotlinSpec.groovy
+++ b/functional-tests/src/test/groovy/io/micronaut/gradle/openapi/OpenApiServerWithKotlinSpec.groovy
@@ -55,10 +55,10 @@ class OpenApiServerWithKotlinSpec extends AbstractOpenApiWithKotlinSpec {
         result.task(":compileKotlin").outcome == TaskOutcome.SUCCESS
 
         and:
-        file("build/generated/openapi/generateServerOpenApiApis/src/main/java/io/micronaut/openapi/api/PetApi.java").exists()
-        file("build/generated/openapi/generateServerOpenApiModels/src/main/java/io/micronaut/openapi/model/Pet.java").exists()
-        file("build/classes/java/main/io/micronaut/openapi/api/PetApi.class").exists()
-        file("build/classes/java/main/io/micronaut/openapi/model/Pet.class").exists()
+        file("build/generated/openapi/generateServerOpenApiApis/src/main/kotlin/io/micronaut/openapi/api/PetApi.kt").exists()
+        file("build/generated/openapi/generateServerOpenApiModels/src/main/kotlin/io/micronaut/openapi/model/Pet.kt").exists()
+        file("build/classes/kotlin/main/io/micronaut/openapi/api/PetApi.class").exists()
+        file("build/classes/kotlin/main/io/micronaut/openapi/model/Pet.class").exists()
     }
 
     def "can generate an kotlin OpenAPI server implementation with properties (KSP)"() {
@@ -111,9 +111,9 @@ class OpenApiServerWithKotlinSpec extends AbstractOpenApiWithKotlinSpec {
         result.task(":compileKotlin").outcome == TaskOutcome.SUCCESS
 
         and:
-        file("build/generated/openapi/generateServerOpenApiApis/src/main/java/io/micronaut/openapi/api/PetApi.java").exists()
-        file("build/generated/openapi/generateServerOpenApiModels/src/main/java/io/micronaut/openapi/model/Pet.java").exists()
-        file("build/classes/java/main/io/micronaut/openapi/api/PetApi.class").exists()
-        file("build/classes/java/main/io/micronaut/openapi/model/Pet.class").exists()
+        file("build/generated/openapi/generateServerOpenApiApis/src/main/kotlin/io/micronaut/openapi/api/PetApi.kt").exists()
+        file("build/generated/openapi/generateServerOpenApiModels/src/main/kotlin/io/micronaut/openapi/model/Pet.kt").exists()
+        file("build/classes/kotlin/main/io/micronaut/openapi/api/PetApi.class").exists()
+        file("build/classes/kotlin/main/io/micronaut/openapi/model/Pet.class").exists()
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 475e6074..4e4c201e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ graalvmPlugin = "0.9.28"
 micronaut-platform = "4.2.0" # This is the platform version, used in our tests
 micronaut-aot = "2.1.1"
 micronaut-testresources = "2.2.0"
-micronaut-openapi = "6.1.0"
+micronaut-openapi = "6.2.1"
 log4j2 = { require = "2.17.1", reject = ["]0, 2.17["] }
 jetbrains-annotations = "24.1.0"
 tomlj = "1.1.0"