diff --git a/aw-client-rust/tests/test.rs b/aw-client-rust/tests/test.rs
index d518aa0a..7a9d3bec 100644
--- a/aw-client-rust/tests/test.rs
+++ b/aw-client-rust/tests/test.rs
@@ -86,24 +86,17 @@ mod test {
         println!("Buckets: {buckets:?}");
         let mut event = Event {
             id: None,
-            timestamp: DateTime::from_utc(
-                DateTime::parse_from_rfc3339("2017-12-30T01:00:00+00:00")
-                    .unwrap()
-                    .naive_utc(),
-                Utc,
-            ),
+            timestamp: DateTime::parse_from_rfc3339("2017-12-30T01:00:00+00:00")
+                .unwrap()
+                .into(),
             duration: Duration::seconds(0),
             data: Map::new(),
         };
         println!("{event:?}");
         client.insert_event(&bucketname, &event).unwrap();
-        // Ugly way to create a UTC from timestamp, see https://github.com/chronotope/chrono/issues/263
-        event.timestamp = DateTime::from_utc(
-            DateTime::parse_from_rfc3339("2017-12-30T01:00:01+00:00")
-                .unwrap()
-                .naive_utc(),
-            Utc,
-        );
+        event.timestamp = DateTime::parse_from_rfc3339("2017-12-30T01:00:01+00:00")
+            .unwrap()
+            .into();
         client.heartbeat(&bucketname, &event, 10.0).unwrap();
 
         let events = client.get_events(&bucketname, None, None, None).unwrap();
diff --git a/aw-server/Cargo.toml b/aw-server/Cargo.toml
index 34f36f07..5f348eed 100644
--- a/aw-server/Cargo.toml
+++ b/aw-server/Cargo.toml
@@ -18,7 +18,7 @@ rocket = { version = "0.5.0", features = ["json"] }
 rocket_cors = { version = "0.6.0" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-chrono = { version = "0.4", features = ["serde"] }
+chrono = { version = "0.4.7", features = ["serde"] }
 appdirs = "0.2.0"
 lazy_static = "1.4"
 log = "0.4"