diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
index c7f1f0335e2..cbbbf252ccd 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
@@ -186,6 +186,8 @@ fun getSomething() = 10
     @Test
     fun testKaptKt15814() {
         val project = Project("kaptKt15814", gradleVersion)
+        project.allowOriginalKapt()
+
         val options = defaultBuildOptions().copy(incremental = false)
 
         project.build("assembleDebug", "test", options = options) {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
index e4cf8f05b13..62549d68918 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
@@ -120,7 +120,7 @@ abstract class BaseGradleIT {
         }
 
         private fun createNewWrapperDir(version: String): File =
-            createTempDir("GradleWrapper-$version")
+            createTempDir("GradleWrapper-$version-")
                         .apply {
                             File(BaseGradleIT.resourcesRootFile, "GradleWrapper").copyRecursively(this)
                             val wrapperProperties = File(this, "gradle/wrapper/gradle-wrapper.properties")