diff --git a/crates/ruma-state-res/src/event_auth.rs b/crates/ruma-state-res/src/event_auth.rs
index 873d9f9a..1ee29636 100644
--- a/crates/ruma-state-res/src/event_auth.rs
+++ b/crates/ruma-state-res/src/event_auth.rs
@@ -836,7 +836,7 @@ mod tests {
     use crate::{
         event_auth::valid_membership_change,
         test_utils::{
-            alice, charlie, event_id, member_content_ban, to_pdu_event, StateEvent, INITIAL_EVENTS,
+            alice, charlie, member_content_ban, to_pdu_event, StateEvent, INITIAL_EVENTS,
         },
         Event, StateMap,
     };
@@ -865,7 +865,7 @@ mod tests {
             Some(charlie().as_str()),
             member_content_ban(),
             &[],
-            &[event_id("IMC")],
+            &["IMC"],
         );
 
         let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned();
@@ -909,7 +909,7 @@ mod tests {
             Some(alice().as_str()),
             member_content_ban(),
             &[],
-            &[event_id("IMC")],
+            &["IMC"],
         );
 
         let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned();
diff --git a/crates/ruma-state-res/src/test_utils.rs b/crates/ruma-state-res/src/test_utils.rs
index 4f5c7e3f..8a3d4294 100644
--- a/crates/ruma-state-res/src/test_utils.rs
+++ b/crates/ruma-state-res/src/test_utils.rs
@@ -17,7 +17,7 @@ use ruma_events::{
     },
     EventType,
 };
-use ruma_identifiers::{EventId, RoomId, RoomVersionId, UserId};
+use ruma_identifiers::{event_id, room_id, user_id, EventId, RoomId, RoomVersionId, UserId};
 use serde_json::{
     json,
     value::{to_raw_value as to_raw_json_value, RawValue as RawJsonValue},
@@ -181,10 +181,10 @@ pub fn do_check(
         expected_state.insert(key, node);
     }
 
-    let start_state = state_at_event.get(&event_id("$START:foo")).unwrap();
+    let start_state = state_at_event.get(&event_id!("$START:foo")).unwrap();
 
     let end_state = state_at_event
-        .get(&event_id("$END:foo"))
+        .get(&event_id!("$END:foo"))
         .unwrap()
         .iter()
         .filter(|(k, v)| {
@@ -341,23 +341,27 @@ pub fn event_id(id: &str) -> EventId {
 }
 
 pub fn alice() -> UserId {
-    UserId::try_from("@alice:foo").unwrap()
+    user_id!("@alice:foo")
 }
+
 pub fn bob() -> UserId {
-    UserId::try_from("@bob:foo").unwrap()
+    user_id!("@bob:foo")
 }
+
 pub fn charlie() -> UserId {
-    UserId::try_from("@charlie:foo").unwrap()
+    user_id!("@charlie:foo")
 }
+
 pub fn ella() -> UserId {
-    UserId::try_from("@ella:foo").unwrap()
+    user_id!("@ella:foo")
 }
+
 pub fn zara() -> UserId {
-    UserId::try_from("@zara:foo").unwrap()
+    user_id!("@zara:foo")
 }
 
 pub fn room_id() -> RoomId {
-    RoomId::try_from("!test:foo").unwrap()
+    room_id!("!test:foo")
 }
 
 pub fn member_content_ban() -> Box<RawJsonValue> {