diff --git a/core/database/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/DatabaseTest.kt b/core/database/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/DatabaseTest.kt
new file mode 100644
index 0000000000..89671ba84c
--- /dev/null
+++ b/core/database/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/DatabaseTest.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.core.database.dao
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import com.google.samples.apps.nowinandroid.core.database.NiaDatabase
+import org.junit.After
+import org.junit.Before
+
+internal abstract class DatabaseTest {
+
+    private lateinit var db: NiaDatabase
+    protected lateinit var newsResourceDao: NewsResourceDao
+    protected lateinit var topicDao: TopicDao
+
+    @Before
+    fun setup() {
+        db = run {
+            val context = ApplicationProvider.getApplicationContext<Context>()
+            Room.inMemoryDatabaseBuilder(
+                context,
+                NiaDatabase::class.java,
+            ).build()
+        }
+        newsResourceDao = db.newsResourceDao()
+        topicDao = db.topicDao()
+    }
+
+    @After
+    fun teardown() = db.close()
+}
diff --git a/core/database/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt b/core/database/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt
index 535ab61a77..8f74d42e83 100644
--- a/core/database/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt
+++ b/core/database/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt
@@ -16,10 +16,6 @@
 
 package com.google.samples.apps.nowinandroid.core.database.dao
 
-import android.content.Context
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import com.google.samples.apps.nowinandroid.core.database.NiaDatabase
 import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceEntity
 import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceTopicCrossRef
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
@@ -27,33 +23,13 @@ import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import kotlinx.datetime.Instant
-import org.junit.After
-import org.junit.Before
 import org.junit.Test
 import kotlin.test.assertEquals
 
-class NewsResourceDaoTest {
-
-    private lateinit var newsResourceDao: NewsResourceDao
-    private lateinit var topicDao: TopicDao
-    private lateinit var db: NiaDatabase
-
-    @Before
-    fun createDb() {
-        val context = ApplicationProvider.getApplicationContext<Context>()
-        db = Room.inMemoryDatabaseBuilder(
-            context,
-            NiaDatabase::class.java,
-        ).build()
-        newsResourceDao = db.newsResourceDao()
-        topicDao = db.topicDao()
-    }
-
-    @After
-    fun closeDb() = db.close()
+internal class NewsResourceDaoTest : DatabaseTest() {
 
     @Test
-    fun newsResourceDao_fetches_items_by_descending_publish_date() = runTest {
+    fun getNewsResources_allEntries_areOrderedByPublishDateDesc() = runTest {
         val newsResourceEntities = listOf(
             testNewsResource(
                 id = "0",
@@ -88,7 +64,7 @@ class NewsResourceDaoTest {
     }
 
     @Test
-    fun newsResourceDao_filters_items_by_news_ids_by_descending_publish_date() = runTest {
+    fun getNewsResources_filteredById_areOrderedByDescendingPublishDate() = runTest {
         val newsResourceEntities = listOf(
             testNewsResource(
                 id = "0",
@@ -126,7 +102,7 @@ class NewsResourceDaoTest {
     }
 
     @Test
-    fun newsResourceDao_filters_items_by_topic_ids_by_descending_publish_date() = runTest {
+    fun getNewsResources_filteredByTopicId_areOrderedByDescendingPublishDate() = runTest {
         val topicEntities = listOf(
             testTopicEntity(
                 id = "1",
@@ -186,7 +162,7 @@ class NewsResourceDaoTest {
     }
 
     @Test
-    fun newsResourceDao_filters_items_by_news_and_topic_ids_by_descending_publish_date() = runTest {
+    fun getNewsResources_filteredByIdAndTopicId_areOrderedByDescendingPublishDate() = runTest {
         val topicEntities = listOf(
             testTopicEntity(
                 id = "1",
@@ -248,7 +224,7 @@ class NewsResourceDaoTest {
     }
 
     @Test
-    fun newsResourceDao_deletes_items_by_ids() =
+    fun deleteNewsResources_byId() =
         runTest {
             val newsResourceEntities = listOf(
                 testNewsResource(
diff --git a/core/database/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/TopicDaoTest.kt b/core/database/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/TopicDaoTest.kt
new file mode 100644
index 0000000000..5fdae3df39
--- /dev/null
+++ b/core/database/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/TopicDaoTest.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.core.database.dao
+
+import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import kotlin.test.assertEquals
+
+internal class TopicDaoTest : DatabaseTest() {
+
+    @Test
+    fun getTopics() = runTest {
+        insertTopics()
+
+        val savedTopics = topicDao.getTopicEntities().first()
+
+        assertEquals(
+            listOf("1", "2", "3"),
+            savedTopics.map { it.id },
+        )
+    }
+
+    @Test
+    fun getTopic() = runTest {
+        insertTopics()
+
+        val savedTopicEntity = topicDao.getTopicEntity("2").first()
+
+        assertEquals("performance", savedTopicEntity.name)
+    }
+
+    @Test
+    fun getTopics_oneOff() = runTest {
+        insertTopics()
+
+        val savedTopics = topicDao.getOneOffTopicEntities()
+
+        assertEquals(
+            listOf("1", "2", "3"),
+            savedTopics.map { it.id },
+        )
+    }
+
+    @Test
+    fun getTopics_byId() = runTest {
+        insertTopics()
+
+        val savedTopics = topicDao.getTopicEntities(setOf("1", "2"))
+            .first()
+
+        assertEquals(listOf("compose", "performance"), savedTopics.map { it.name })
+    }
+
+    @Test
+    fun insertTopic_newEntryIsIgnoredIfAlreadyExists() = runTest {
+        insertTopics()
+        topicDao.insertOrIgnoreTopics(
+            listOf(testTopicEntity("1", "compose")),
+        )
+
+        val savedTopics = topicDao.getOneOffTopicEntities()
+
+        assertEquals(3, savedTopics.size)
+    }
+
+    @Test
+    fun upsertTopic_existingEntryIsUpdated() = runTest {
+        insertTopics()
+        topicDao.upsertTopics(
+            listOf(testTopicEntity("1", "newName")),
+        )
+
+        val savedTopics = topicDao.getOneOffTopicEntities()
+
+        assertEquals(3, savedTopics.size)
+        assertEquals("newName", savedTopics.first().name)
+    }
+
+    @Test
+    fun deleteTopics_byId_existingEntriesAreDeleted() = runTest {
+        insertTopics()
+        topicDao.deleteTopics(listOf("1", "2"))
+
+        val savedTopics = topicDao.getOneOffTopicEntities()
+
+        assertEquals(1, savedTopics.size)
+        assertEquals("3", savedTopics.first().id)
+    }
+
+    private suspend fun insertTopics() {
+        val topicEntities = listOf(
+            testTopicEntity("1", "compose"),
+            testTopicEntity("2", "performance"),
+            testTopicEntity("3", "headline"),
+        )
+        topicDao.insertOrIgnoreTopics(topicEntities)
+    }
+}
+
+private fun testTopicEntity(
+    id: String = "0",
+    name: String,
+) = TopicEntity(
+    id = id,
+    name = name,
+    shortDescription = "",
+    longDescription = "",
+    url = "",
+    imageUrl = "",
+)