diff --git a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/search/QueryParserTest.kt b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/search/QueryParserTest.kt
index 1c83855465..c34a12f489 100644
--- a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/search/QueryParserTest.kt
+++ b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/search/QueryParserTest.kt
@@ -101,15 +101,13 @@ class QueryParserTest {
     @Test
     fun sinceDate() {
         val q = QueryParser.parse("since:2025-01-01")
-        // 2025-01-01 00:00:00 UTC
-        assertEquals(1735689600L, q.since)
+        assertEquals(LocalClock.startOfDay(SearchDate(2025, 1, 1)), q.since)
     }
 
     @Test
     fun sinceDateYearOnly() {
         val q = QueryParser.parse("since:2025")
-        // 2025-01-01 00:00:00 UTC
-        assertEquals(1735689600L, q.since)
+        assertEquals(LocalClock.startOfDay(SearchDate(2025, 1, 1)), q.since)
     }
 
     @Test
@@ -214,7 +212,7 @@ class QueryParserTest {
     fun combinedQuery() {
         val q = QueryParser.parse("kind:note since:2025-01-01 #bitcoin -spam lightning")
         assertEquals(listOf(1), q.kinds.toList())
-        assertEquals(1735689600L, q.since)
+        assertEquals(LocalClock.startOfDay(SearchDate(2025, 1, 1)), q.since)
         assertEquals(listOf("bitcoin"), q.hashtags.toList())
         assertEquals(listOf("spam"), q.excludeTerms.toList())
         assertEquals("lightning", q.text)
diff --git a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/search/QuerySerializerTest.kt b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/search/QuerySerializerTest.kt
index 0534e50138..94b9754bdc 100644
--- a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/search/QuerySerializerTest.kt
+++ b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/search/QuerySerializerTest.kt
@@ -20,6 +20,8 @@
  */
 package com.vitorpamplona.amethyst.commons.search
 
+import com.vitorpamplona.amethyst.commons.search.calendar.LocalClock
+import com.vitorpamplona.amethyst.commons.search.calendar.SearchDate
 import kotlinx.collections.immutable.persistentListOf
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -63,13 +65,13 @@ class QuerySerializerTest {
 
     @Test
     fun sinceDate() {
-        val q = SearchQuery(since = 1735689600L) // 2025-01-01
+        val q = SearchQuery(since = LocalClock.startOfDay(SearchDate(2025, 1, 1)))
         assertEquals("since:2025-01-01", QuerySerializer.serialize(q))
     }
 
     @Test
     fun untilDate() {
-        val q = SearchQuery(until = 1735689600L)
+        val q = SearchQuery(until = LocalClock.startOfDay(SearchDate(2025, 1, 1)))
         assertEquals("until:2025-01-01", QuerySerializer.serialize(q))
     }
 
@@ -115,7 +117,7 @@ class QuerySerializerTest {
             SearchQuery(
                 authorNames = persistentListOf("vitor"),
                 kinds = persistentListOf(1),
-                since = 1735689600L,
+                since = LocalClock.startOfDay(SearchDate(2025, 1, 1)),
                 hashtags = persistentListOf("bitcoin"),
                 text = "lightning",
                 excludeTerms = persistentListOf("spam"),