diff --git a/crates/handlers/src/test_utils.rs b/crates/handlers/src/test_utils.rs
index 720d2dee..8b2a4c51 100644
--- a/crates/handlers/src/test_utils.rs
+++ b/crates/handlers/src/test_utils.rs
@@ -23,7 +23,7 @@ use headers::{Authorization, ContentType, HeaderMapExt, HeaderName};
 use hyper::{header::CONTENT_TYPE, Request, Response, StatusCode};
 use mas_axum_utils::http_client_factory::HttpClientFactory;
 use mas_keystore::{Encrypter, JsonWebKey, JsonWebKeySet, Keystore, PrivateKey};
-use mas_matrix::{HomeserverConnection, MatrixUser, MockHomeserverConnection, ProvisionRequest};
+use mas_matrix::MockHomeserverConnection;
 use mas_policy::PolicyFactory;
 use mas_router::{SimpleRoute, UrlBuilder};
 use mas_storage::{clock::MockClock, BoxClock, BoxRepository, BoxRng, Repository};
diff --git a/crates/matrix/src/lib.rs b/crates/matrix/src/lib.rs
index b5f799d1..14480184 100644
--- a/crates/matrix/src/lib.rs
+++ b/crates/matrix/src/lib.rs
@@ -18,7 +18,7 @@
 
 mod mock;
 
-pub use self::mock::MockHomeserverConnection;
+pub use self::mock::HomeserverConnection as MockHomeserverConnection;
 
 #[derive(Debug)]
 pub struct MatrixUser {
diff --git a/crates/matrix/src/mock.rs b/crates/matrix/src/mock.rs
index 33d1e0d4..53bfbb0a 100644
--- a/crates/matrix/src/mock.rs
+++ b/crates/matrix/src/mock.rs
@@ -18,7 +18,7 @@ use anyhow::Context;
 use async_trait::async_trait;
 use tokio::sync::RwLock;
 
-use crate::{HomeserverConnection, MatrixUser, ProvisionRequest};
+use crate::{MatrixUser, ProvisionRequest};
 
 struct MockUser {
     sub: String,
@@ -28,15 +28,15 @@ struct MockUser {
     emails: Option<Vec<String>>,
 }
 
-/// A Mock implementation of a [`HomeserverConnection`], which never fails and
+/// A mock implementation of a [`HomeserverConnection`], which never fails and
 /// doesn't do anything.
-pub struct MockHomeserverConnection {
+pub struct HomeserverConnection {
     homeserver: String,
     users: RwLock<HashMap<String, MockUser>>,
 }
 
-impl MockHomeserverConnection {
-    /// Create a new [`MockHomeserverConnection`].
+impl HomeserverConnection {
+    /// Create a new mock connection.
     pub fn new<H>(homeserver: H) -> Self
     where
         H: Into<String>,
@@ -49,7 +49,7 @@ impl MockHomeserverConnection {
 }
 
 #[async_trait]
-impl HomeserverConnection for MockHomeserverConnection {
+impl crate::HomeserverConnection for HomeserverConnection {
     type Error = anyhow::Error;
 
     fn homeserver(&self) -> &str {
@@ -127,10 +127,11 @@ impl HomeserverConnection for MockHomeserverConnection {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::HomeserverConnection as _;
 
     #[tokio::test]
     async fn test_mock_connection() {
-        let conn = MockHomeserverConnection::new("example.org");
+        let conn = HomeserverConnection::new("example.org");
 
         let mxid = "@test:example.org";
         let device = "test";