diff --git a/.mapping.json b/.mapping.json
index 1c78e1228..fe3289515 100644
--- a/.mapping.json
+++ b/.mapping.json
@@ -438,7 +438,6 @@
   "client/android/api-generator-test/jacoco.excludes":"divkit/public/client/android/api-generator-test/jacoco.excludes",
   "client/android/api-generator-test/lint.xml":"divkit/public/client/android/api-generator-test/lint.xml",
   "client/android/api-generator-test/proguard-rules.pro":"divkit/public/client/android/api-generator-test/proguard-rules.pro",
-  "client/android/api-generator-test/src/main/AndroidManifest.xml":"divkit/public/client/android/api-generator-test/src/main/AndroidManifest.xml",
   "client/android/api-generator-test/src/test/java/com/yandex/generator/ArrayOfNestedItemsTest.kt":"divkit/public/client/android/api-generator-test/src/test/java/com/yandex/generator/ArrayOfNestedItemsTest.kt",
   "client/android/api-generator-test/src/test/java/com/yandex/generator/ArrayTest.kt":"divkit/public/client/android/api-generator-test/src/test/java/com/yandex/generator/ArrayTest.kt",
   "client/android/api-generator-test/src/test/java/com/yandex/generator/ArrayWithTransformTest.kt":"divkit/public/client/android/api-generator-test/src/test/java/com/yandex/generator/ArrayWithTransformTest.kt",
diff --git a/client/android/api-generator-test/src/main/AndroidManifest.xml b/client/android/api-generator-test/src/main/AndroidManifest.xml
deleted file mode 100644
index 6b3723955..000000000
--- a/client/android/api-generator-test/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<manifest package="com.yandex.generator">
-</manifest>
diff --git a/client/android/build.gradle b/client/android/build.gradle
index 194dedf53..dcaea6ad4 100644
--- a/client/android/build.gradle
+++ b/client/android/build.gradle
@@ -67,27 +67,6 @@ allprojects {
             jvmTarget = "1.8"
         }
     }
-
-    tasks.whenTaskAdded { task ->
-        if (task.name == "apiDump") {
-            afterEvaluate {
-                task.configure {
-                    into "$rootProject.projectDir/../../../internal/android/api-dump"
-                    preserve {
-                        include "*.api"
-                    }
-                }
-            }
-        }
-
-        if (task.name == "apiCheck") {
-            afterEvaluate {
-                task.configure {
-                    projectApiDir = file("$rootProject.projectDir/../../../internal/android/api-dump")
-                }
-            }
-        }
-    }
 }
 
 subprojects {
diff --git a/client/android/screenshot-test-plugin/src/main/java/com/yandex/test/screenshot/ScreenshotTestPlugin.kt b/client/android/screenshot-test-plugin/src/main/java/com/yandex/test/screenshot/ScreenshotTestPlugin.kt
index 1b32b2432..27e5b9709 100644
--- a/client/android/screenshot-test-plugin/src/main/java/com/yandex/test/screenshot/ScreenshotTestPlugin.kt
+++ b/client/android/screenshot-test-plugin/src/main/java/com/yandex/test/screenshot/ScreenshotTestPlugin.kt
@@ -30,9 +30,10 @@ class ScreenshotTestPlugin : Plugin<Project> {
     }
 
     private fun register(project: Project) {
-        project.tasks.register(GenerateScreenshotConfigTask.NAME, GenerateScreenshotConfigTask::class.java) { task ->
+        project.tasks.register(GenerateScreenshotConfigTask.NAME, GenerateScreenshotConfigTask::class.java).let {
+            val outputDir = it.get().outputDir
             project.android.variants.all { variant ->
-                variant.registerJavaGeneratingTask(task, task.outputDir)
+                variant.registerJavaGeneratingTask(it, outputDir)
             }
         }
         project.tasks.register(ValidateTestResultsTask.NAME, ValidateTestResultsTask::class.java)
@@ -41,14 +42,14 @@ class ScreenshotTestPlugin : Plugin<Project> {
             it.mustRunAfter(PullScreenshotsTask.NAME)
         }
 
-        project.tasks.whenTaskAdded { task ->
+        project.tasks.configureEach { task ->
             val isDependentTask = task.name.run {
                 startsWith("compile") && (endsWith("JavaWithJavac") || endsWith("Kotlin"))
             }
             if (enabled && isDependentTask) task.dependsOn(GenerateScreenshotConfigTask.NAME)
         }
 
-        project.tasks.whenTaskAdded { task ->
+        project.tasks.configureEach { task ->
             val isDependentTask = task.name.run {
                 startsWith("connected") && endsWith("AndroidTest")
             }