diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
index 51c382775..405649aa8 100644
--- a/core/database/build.gradle.kts
+++ b/core/database/build.gradle.kts
@@ -41,12 +41,11 @@ kotlin {
             implementation(libs.sqldelight.android.driver)
         }
         androidUnitTest.dependencies {
-            implementation(libs.androidx.test.core)
+            implementation(libs.sqldelight.sqlite.driver)
         }
         nativeMain.dependencies {
             implementation(libs.sqldelight.native.driver)
         }
-
         jvmMain.dependencies {
             implementation(libs.sqldelight.sqlite.driver)
         }
diff --git a/core/database/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/database/BaseTest.android.kt b/core/database/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/database/BaseTest.android.kt
index e478729b9..56e63a063 100644
--- a/core/database/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/database/BaseTest.android.kt
+++ b/core/database/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/database/BaseTest.android.kt
@@ -16,13 +16,10 @@
 
 package com.google.samples.apps.nowinandroid.core.database
 
-import android.content.Context
-import androidx.test.core.app.ApplicationProvider
-import app.cash.sqldelight.async.coroutines.synchronous
 import app.cash.sqldelight.db.SqlDriver
-import app.cash.sqldelight.driver.android.AndroidSqliteDriver
+import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
 
 actual suspend fun createDriver(): SqlDriver {
-    val context: Context = ApplicationProvider.getApplicationContext()
-    return AndroidSqliteDriver(NiaDatabase.Schema.synchronous(), context, "nia-database-test.db")
+    return JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY)
+        .also { NiaDatabase.Schema.create(it).await() }
 }
diff --git a/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceFts.sq b/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceFts.sq
index f14fcb96c..59795c2e4 100644
--- a/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceFts.sq
+++ b/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceFts.sq
@@ -1,7 +1,5 @@
 CREATE VIRTUAL TABLE news_resource_fts
 USING FTS4(
-    tokenizer = porter,
-    content = news_resources,
     news_resource_id TEXT NOT NULL,
     title TEXT NOT NULL,
     content TEXT NOT NULL,