diff --git a/gradle_scripts/android-module-bootstrap.gradle b/gradle_scripts/android-module-bootstrap.gradle
index 0b10209a..98fb9516 100644
--- a/gradle_scripts/android-module-bootstrap.gradle
+++ b/gradle_scripts/android-module-bootstrap.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'jacoco-android'
+apply plugin: 'jacoco'
 apply from: "${project.rootDir}/gradle_scripts/code_quality.gradle"
 
 androidExtensions {
@@ -51,6 +51,10 @@ targetCompatibility = JavaVersion.VERSION_1_8
 
 tasks.withType(Test) {
     useJUnitPlatform()
+    jacoco {
+        includeNoLocationClasses = true
+        excludes += jacocoExclude
+    }
 }
 
 dependencies {
@@ -68,10 +72,3 @@ ext {
     jacocoExclude = []
 }
 
-jacocoAndroidUnitTestReport {
-    excludes += jacocoExclude
-}
-
-afterEvaluate {
-    testDebugUnitTest.finalizedBy jacocoTestDebugUnitTestReport
-}
diff --git a/gradle_scripts/jacoco.gradle b/gradle_scripts/jacoco.gradle
index 237c6f78..f7b30b11 100644
--- a/gradle_scripts/jacoco.gradle
+++ b/gradle_scripts/jacoco.gradle
@@ -51,20 +51,20 @@ tasks.create(name: 'jacocoFullReport', type: JacocoReport, dependsOn: 'jacocoMer
             subproject.plugins.withId("jacoco") {
                 project.logger.info("${subproject.name} has Jacoco plugin applied")
                 subproject.plugins.withId("kotlin-android") {
-                    project.logger.warn("${subproject.name} is android project")
+                    project.logger.info("${subproject.name} is android project")
                     def mainSources = subproject.extensions.findByName("android").sourceSets['main']
-                    project.logger.warn("Android sources: ${mainSources.java.srcDirs}")
+                    project.logger.info("Android sources: ${mainSources.java.srcDirs}")
                     mainSources.java.srcDirs.forEach {
                         additionalSourceDirs(it)
                     }
-                    project.logger.warn("Subproject exclude: ${subproject.jacocoExclude}")
+                    project.logger.info("Subproject exclude: ${subproject.jacocoExclude}")
                     additionalClassDirs(fileTree(
                             dir: "${subproject.buildDir}/tmp/kotlin-classes/debug",
                             excludes: subproject.jacocoExclude
                     ))
                 }
                 subproject.plugins.withId("kotlin") { plugin ->
-                    project.logger.warn("${subproject.name} is common kotlin project")
+                    project.logger.info("${subproject.name} is common kotlin project")
                     SourceDirectorySet mainSources = subproject.extensions.getByName("kotlin")
                             .sourceSets[SourceSet.MAIN_SOURCE_SET_NAME]
                             .kotlin
@@ -72,7 +72,7 @@ tasks.create(name: 'jacocoFullReport', type: JacocoReport, dependsOn: 'jacocoMer
                         project.logger.debug("Adding sources: $it")
                         additionalSourceDirs(it)
                     }
-                    project.logger.warn("Subproject exclude: ${subproject.jacocoExclude}")
+                    project.logger.info("Subproject exclude: ${subproject.jacocoExclude}")
                     additionalClassDirs(fileTree(
                             dir: "${subproject.buildDir}/classes/kotlin/main",
                             excludes: subproject.jacocoExclude