diff --git a/PKG-INFO b/PKG-INFO
index ff978cdcc9601e77dfdd4965952a9e112597f390..92f2105429052a4a2bc441be0b1bc8e58b49e0b2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: swh.model
-Version: 0.0.34
+Version: 0.0.35
 Summary: Software Heritage data model
 Home-page: https://forge.softwareheritage.org/diffusion/DMOD/
 Author: Software Heritage developers
 Author-email: swh-devel@inria.fr
 License: UNKNOWN
 Project-URL: Funding, https://www.softwareheritage.org/donate
-Project-URL: Source, https://forge.softwareheritage.org/source/swh-model
 Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest
+Project-URL: Source, https://forge.softwareheritage.org/source/swh-model
 Description: swh-model
         =========
         
diff --git a/swh.model.egg-info/PKG-INFO b/swh.model.egg-info/PKG-INFO
index ff978cdcc9601e77dfdd4965952a9e112597f390..92f2105429052a4a2bc441be0b1bc8e58b49e0b2 100644
--- a/swh.model.egg-info/PKG-INFO
+++ b/swh.model.egg-info/PKG-INFO
@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: swh.model
-Version: 0.0.34
+Version: 0.0.35
 Summary: Software Heritage data model
 Home-page: https://forge.softwareheritage.org/diffusion/DMOD/
 Author: Software Heritage developers
 Author-email: swh-devel@inria.fr
 License: UNKNOWN
 Project-URL: Funding, https://www.softwareheritage.org/donate
-Project-URL: Source, https://forge.softwareheritage.org/source/swh-model
 Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest
+Project-URL: Source, https://forge.softwareheritage.org/source/swh-model
 Description: swh-model
         =========
         
diff --git a/swh/model/hypothesis_strategies.py b/swh/model/hypothesis_strategies.py
index 59f821463e621f443dcd497b650c891980bee7c4..3e006c8afaae1d5ec8f51c6135ae7023fbabc062 100644
--- a/swh/model/hypothesis_strategies.py
+++ b/swh/model/hypothesis_strategies.py
@@ -41,8 +41,10 @@ def persons():
 
 
 def timestamps():
-    max_seconds = datetime.datetime.max.timestamp()
-    min_seconds = datetime.datetime.min.timestamp()
+    max_seconds = datetime.datetime.max.replace(
+        tzinfo=datetime.timezone.utc).timestamp()
+    min_seconds = datetime.datetime.min.replace(
+        tzinfo=datetime.timezone.utc).timestamp()
     return builds(
         Timestamp,
         seconds=integers(min_seconds, max_seconds),
diff --git a/version.txt b/version.txt
index 60bb27fc5d722f6d7c0fab20fee11190695f5b98..871d5f52779001fa7c99b4262782555678359132 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v0.0.34-0-g54490c9
\ No newline at end of file
+v0.0.35-0-gfee3a41
\ No newline at end of file