diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
index 5d34aac2c..51dfb5393 100644
--- a/core/data/build.gradle.kts
+++ b/core/data/build.gradle.kts
@@ -25,6 +25,7 @@ android {
     testOptions {
         unitTests {
             isIncludeAndroidResources = true
+            isReturnDefaultValues = true
         }
     }
 }
@@ -44,4 +45,4 @@ dependencies {
 
     testImplementation(project(":core:datastore-test"))
     testImplementation(project(":core:testing"))
-}
\ No newline at end of file
+}
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
index f2c6c1892..1787a5b8f 100644
--- a/core/datastore/build.gradle.kts
+++ b/core/datastore/build.gradle.kts
@@ -33,6 +33,11 @@ android {
         consumerProguardFiles("consumer-proguard-rules.pro")
     }
     namespace = "com.google.samples.apps.nowinandroid.core.datastore"
+    testOptions {
+        unitTests {
+            isReturnDefaultValues = true
+        }
+    }
 }
 
 // Setup protobuf configuration, generating lite Java and Kotlin classes