diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
index bc39d0d23a..6225add444 100644
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -64,7 +64,7 @@ class AllProjectConfigurer {
 
       buildTypes {
         getByName("debug") {
-          isTestCoverageEnabled = false
+          isTestCoverageEnabled = true
           multiDexEnabled = true
         }
       }
diff --git a/jacoco.gradle b/jacoco.gradle
index 6b421ac2cf..d793987aad 100644
--- a/jacoco.gradle
+++ b/jacoco.gradle
@@ -22,11 +22,12 @@ jacoco {
   toolVersion = "0.8.12"
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
   jacoco.includeNoLocationClasses = true
 }
 
-task jacocoInstrumentationTestReport(type: JacocoReport, dependsOn: ['createDebugCoverageReport']) {
+tasks.register('jacocoInstrumentationTestReport', JacocoReport) {
+  dependsOn = ['createDebugCoverageReport']
   group "Reporting"
   description "Generate Jacoco coverage reports."
   reports {
diff --git a/lintConfig.xml b/lintConfig.xml
index 6158db5967..fd8ecfffea 100644
--- a/lintConfig.xml
+++ b/lintConfig.xml
@@ -35,7 +35,7 @@
   <issue id="InvalidPackage">
     <ignore path="**simple-xml-2.7.1.jar" />
     <ignore path="**javapoet-1.8.0.jar" />
-    <ignore path="**/org.jacoco.agent-0.8.10-runtime.jar" />
+    <ignore path="**/org.jacoco.agent-0.8.12-runtime.jar" />
     <ignore regexp="kotlinx.coroutines.debug.AgentPremain" />
   </issue>
   <issue id="IconLocation">
diff --git a/team-props/git-hooks.gradle b/team-props/git-hooks.gradle
index 1c80c43f65..878591bc4d 100644
--- a/team-props/git-hooks.gradle
+++ b/team-props/git-hooks.gradle
@@ -28,5 +28,7 @@ task installGitHooks(type: Exec) {
 }
 
 afterEvaluate {
-  tasks['preBuild'].dependsOn installGitHooks
+  tasks.named('preBuild').configure {
+    dependsOn installGitHooks
+  }
 }