diff --git a/.clippy.toml b/.clippy.toml
index b34875bf..88520209 100644
--- a/.clippy.toml
+++ b/.clippy.toml
@@ -1,10 +1,20 @@
 msrv = "1.55"
 avoid-breaking-exported-api = false
+disallowed-methods = [
+    # https://github.com/serde-rs/json/issues/160
+    "serde_json::from_reader",
+]
 disallowed-types = [
     "std::collections::HashMap",
     "std::collections::HashSet",
 ]
 enforced-import-renames = [
+    { path = "serde_json::from_slice", rename = "from_json_slice" },
+    { path = "serde_json::from_str", rename = "from_json_str" },
+    { path = "serde_json::from_value", rename = "from_json_value" },
+    { path = "serde_json::to_value", rename = "to_json_value" },
+    { path = "serde_json::value::to_raw_value", rename = "to_raw_json_value" },
+    { path = "serde_json::value::RawValue", rename = "RawJsonValue" },
     { path = "serde_json::Value", rename = "JsonValue" },
 ]
 standard-macro-braces = [
diff --git a/crates/ruma-events/tests/redacted.rs b/crates/ruma-events/tests/redacted.rs
index 786a865a..ce4012f5 100644
--- a/crates/ruma-events/tests/redacted.rs
+++ b/crates/ruma-events/tests/redacted.rs
@@ -16,7 +16,8 @@ use ruma_events::{
 };
 use ruma_identifiers::{event_id, room_id, user_id, RoomVersionId};
 use serde_json::{
-    from_value as from_json_value, json, to_value as to_json_value, value::to_raw_value,
+    from_value as from_json_value, json, to_value as to_json_value,
+    value::to_raw_value as to_raw_json_value,
 };
 
 fn unsigned() -> RedactedUnsigned {
@@ -320,7 +321,7 @@ fn redact_message_content() {
         "url": "mxc://example.com/AuDi0",
     });
 
-    let raw_json = to_raw_value(&json).unwrap();
+    let raw_json = to_raw_json_value(&json).unwrap();
     let content = RoomMessageEventContent::from_parts("m.room.message", &raw_json).unwrap();
 
     assert_matches!(content.redact(&RoomVersionId::V6), RedactedRoomMessageEventContent { .. });
@@ -334,7 +335,7 @@ fn redact_state_content() {
         "room_version": "4",
     });
 
-    let raw_json = to_raw_value(&json).unwrap();
+    let raw_json = to_raw_json_value(&json).unwrap();
     let content = RoomCreateEventContent::from_parts("m.room.create", &raw_json).unwrap();
 
     assert_matches!(
diff --git a/crates/ruma-state-res/.clippy.toml b/crates/ruma-state-res/.clippy.toml
index 7f76424a..962cf70b 100644
--- a/crates/ruma-state-res/.clippy.toml
+++ b/crates/ruma-state-res/.clippy.toml
@@ -1,7 +1,19 @@
 msrv = "1.55"
 avoid-breaking-exported-api = false
+disallowed-methods = [
+    # https://github.com/serde-rs/json/issues/160
+    "serde_json::from_reader",
+]
 disallowed-types = []
-enforced-import-renames = [ { path = "serde_json::Value", rename = "JsonValue" } ]
+enforced-import-renames = [
+    { path = "serde_json::from_slice", rename = "from_json_slice" },
+    { path = "serde_json::from_str", rename = "from_json_str" },
+    { path = "serde_json::from_value", rename = "from_json_value" },
+    { path = "serde_json::to_value", rename = "to_json_value" },
+    { path = "serde_json::value::to_raw_value", rename = "to_raw_json_value" },
+    { path = "serde_json::value::RawValue", rename = "RawJsonValue" },
+    { path = "serde_json::Value", rename = "JsonValue" },
+]
 standard-macro-braces = [
     { name = "btreeset", brace = "[" },
     { name = "btreemap", brace = "{" },