diff --git a/app/build.gradle b/app/build.gradle
index 45ff6ea..a578f9d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -114,6 +114,11 @@ buildscript {
     ext.mockito_kotlin_version = "2.2.0"
 }
 
+tasks.withType(Test) {
+    jacoco.includeNoLocationClasses = true
+    jacoco.excludes = ['jdk.internal.*']
+}
+
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
diff --git a/jacoco.gradle b/jacoco.gradle
index 3359e96..a1e0dab 100644
--- a/jacoco.gradle
+++ b/jacoco.gradle
@@ -4,7 +4,16 @@ jacoco {
     toolVersion = "0.7.5.201505241946"
 }
 
-project.afterEvaluate {
+testOptions {
+    unitTests.all {
+        jacoco {
+            includeNoLocationClasses = true
+        }
+    }
+    unitTests.returnDefaultValues = true
+}
+
+jacocoTestReport {
     // Grab all build types and product flavors
     def buildTypes = android.buildTypes.collect { type -> type.name }
     def productFlavors = android.productFlavors.collect { flavor -> flavor.name }