diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle
index f990d9340db..7c5555dcbab 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle
@@ -28,6 +28,9 @@ dependencies {
     testRuntime project(path: ':kotlin-android-extensions', configuration: 'runtimeJar')
 }
 
+// Include Gradle task properties validation into the testing procedure:
+test.dependsOn(":kotlin-gradle-plugin:validateTaskProperties")
+
 test.dependsOn(":kotlin-allopen:install",
                ":kotlin-android-extensions:install",
                ":kotlin-build-common:install",
@@ -40,6 +43,7 @@ test.dependsOn(":kotlin-allopen:install",
                ":kotlin-stdlib-jre8:install",
                ":examples:annotation-processor-example:install")
 
+
 // Validate that all dependencies 'install' tasks are added to 'test' dependencies
 // Test dependencies are specified as paths to avoid forcing dependency resolution
 // and also to avoid specifying evaluationDependsOn for each testCompile dependency.
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle b/libraries/tools/kotlin-gradle-plugin/build.gradle
index c55dcf5e9f8..2cd9db1d384 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'java'
+apply plugin: 'java-gradle-plugin'
 apply plugin: 'kotlin'
 apply plugin: 'groovy'
 apply plugin: 'org.jetbrains.dokka'
@@ -40,7 +41,7 @@ dependencies {
     compileOnly project(':kotlin-annotation-processing-gradle')
 
     compileOnly 'com.android.tools.build:gradle:2.0.0'
-    compileOnly 'org.codehaus.groovy:groovy-all:2.4.11'
+    compileOnly 'org.codehaus.groovy:groovy-all:2.4.12'
     compileOnly gradleApi()
 
     runtime project(path: ':kotlin-compiler-embeddable', configuration: "runtimeJar")
@@ -49,7 +50,7 @@ dependencies {
     runtime project(path: ':kotlin-compiler-runner', configuration: 'runtimeJar')
 
     agp25CompileOnly 'com.android.tools.build:gradle:3.0.0-alpha1'
-    agp25CompileOnly 'org.codehaus.groovy:groovy-all:2.3.9'
+    agp25CompileOnly 'org.codehaus.groovy:groovy-all:2.4.12'
     agp25CompileOnly gradleApi()
     agp25CompileOnly project(':kotlin-annotation-processing')
     agp25CompileOnly project(':kotlin-annotation-processing-gradle')
@@ -108,6 +109,8 @@ artifacts {
 
 test.executable = "${JDK_18}/bin/java"
 
+validateTaskProperties.failOnWarning = true
+
 dokka {
     outputFormat = 'markdown'
     includes = ["${projectDir}/Module.md"]