diff --git a/app/build.gradle b/app/build.gradle
index bf4ce0a20..9b2d7bfea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -116,7 +116,7 @@ dependencies {
     implementation project(':core-ui')
 
     androidTestImplementation project(':core-testing')
-    implementation project(':core-datastore-test')
+    androidTestImplementation project(':core-datastore-test')
 
     coreLibraryDesugaring libs.android.desugarJdkLibs
 
diff --git a/core-datastore/build.gradle b/core-datastore/build.gradle
index c83db8768..1024cedba 100644
--- a/core-datastore/build.gradle
+++ b/core-datastore/build.gradle
@@ -62,7 +62,10 @@ dependencies {
     implementation libs.kotlinx.coroutines.android
 
     implementation libs.androidx.dataStore
-    implementation libs.protobuf.kotlin.lite
+    implementation(libs.protobuf.kotlin.lite) {
+        // TODO: https://github.com/protocolbuffers/protobuf/issues/9517
+        exclude group: "org.jetbrains.kotlin", module: "kotlin-test"
+    }
 
     implementation libs.hilt.android
     kapt libs.hilt.compiler