diff --git a/crates/matrix-sdk-ui/src/timeline/event_item/mod.rs b/crates/matrix-sdk-ui/src/timeline/event_item/mod.rs
index 465e0958b..3e52d3fe6 100644
--- a/crates/matrix-sdk-ui/src/timeline/event_item/mod.rs
+++ b/crates/matrix-sdk-ui/src/timeline/event_item/mod.rs
@@ -507,15 +507,14 @@ pub enum EventItemOrigin {
 mod tests {
     use assert_matches::assert_matches;
     use assert_matches2::assert_let;
-    use matrix_sdk::{config::RequestConfig, test_utils::test_client_builder, Client};
+    use matrix_sdk::test_utils::logged_in_client;
     use matrix_sdk_base::{
-        deserialized_responses::SyncTimelineEvent, latest_event::LatestEvent, BaseClient,
-        MinimalStateEvent, OriginalMinimalStateEvent, SessionMeta,
+        deserialized_responses::SyncTimelineEvent, latest_event::LatestEvent, MinimalStateEvent,
+        OriginalMinimalStateEvent,
     };
     use matrix_sdk_test::{async_test, sync_timeline_event};
     use ruma::{
         api::client::sync::sync_events::v4,
-        device_id,
         events::{
             room::{
                 member::RoomMemberEventContent,
@@ -697,23 +696,4 @@ mod tests {
         })
         .into()
     }
-
-    /// Copied from matrix_sdk_base::sliding_sync::test
-    async fn logged_in_client(homeserver_url: Option<String>) -> Client {
-        let base_client = BaseClient::new();
-        base_client
-            .set_session_meta(SessionMeta {
-                user_id: user_id!("@u:e.uk").to_owned(),
-                device_id: device_id!("XYZ").to_owned(),
-            })
-            .await
-            .expect("Failed to set session meta");
-
-        test_client_builder(homeserver_url)
-            .request_config(RequestConfig::new().disable_retry())
-            .base_client(base_client)
-            .build()
-            .await
-            .unwrap()
-    }
 }
diff --git a/crates/matrix-sdk-ui/src/timeline/sliding_sync_ext.rs b/crates/matrix-sdk-ui/src/timeline/sliding_sync_ext.rs
index 1c5f2f7fc..3ac674210 100644
--- a/crates/matrix-sdk-ui/src/timeline/sliding_sync_ext.rs
+++ b/crates/matrix-sdk-ui/src/timeline/sliding_sync_ext.rs
@@ -44,14 +44,11 @@ impl SlidingSyncRoomExt for SlidingSyncRoom {
 #[cfg(test)]
 mod tests {
     use assert_matches::assert_matches;
-    use matrix_sdk::{
-        config::RequestConfig, test_utils::test_client_builder, Client, SlidingSyncRoom,
-    };
-    use matrix_sdk_base::{deserialized_responses::SyncTimelineEvent, BaseClient, SessionMeta};
+    use matrix_sdk::{test_utils::logged_in_client, Client, SlidingSyncRoom};
+    use matrix_sdk_base::deserialized_responses::SyncTimelineEvent;
     use matrix_sdk_test::async_test;
     use ruma::{
         api::client::sync::sync_events::v4,
-        device_id,
         events::room::message::{MessageFormat, MessageType},
         room_id,
         serde::Raw,
@@ -143,23 +140,4 @@ mod tests {
         response.rooms.insert(room_id.to_owned(), room);
         response
     }
-
-    /// Copied from matrix_sdk_base::sliding_sync::test
-    async fn logged_in_client(homeserver_url: Option<String>) -> Client {
-        let base_client = BaseClient::new();
-        base_client
-            .set_session_meta(SessionMeta {
-                user_id: user_id!("@u:e.uk").to_owned(),
-                device_id: device_id!("XYZ").to_owned(),
-            })
-            .await
-            .expect("Failed to set session meta");
-
-        test_client_builder(homeserver_url)
-            .request_config(RequestConfig::new().disable_retry())
-            .base_client(base_client)
-            .build()
-            .await
-            .unwrap()
-    }
 }
diff --git a/crates/matrix-sdk/tests/integration/main.rs b/crates/matrix-sdk/tests/integration/main.rs
index 0c3b51632..667243cc1 100644
--- a/crates/matrix-sdk/tests/integration/main.rs
+++ b/crates/matrix-sdk/tests/integration/main.rs
@@ -3,13 +3,10 @@
 
 use matrix_sdk::{
     config::SyncSettings,
-    matrix_auth::{MatrixSession, MatrixSessionTokens},
-    test_utils::{no_retry_test_client, test_client_builder},
+    test_utils::{self, no_retry_test_client, test_client_builder},
     Client, ClientBuilder,
 };
-use matrix_sdk_base::SessionMeta;
 use matrix_sdk_test::test_json;
-use ruma::{device_id, user_id};
 use serde::Serialize;
 use wiremock::{
     matchers::{header, method, path, path_regex, query_param, query_param_is_missing},
@@ -41,16 +38,8 @@ async fn no_retry_test_client_with_server() -> (Client, MockServer) {
 }
 
 async fn logged_in_client() -> (Client, MockServer) {
-    let session = MatrixSession {
-        meta: SessionMeta {
-            user_id: user_id!("@example:localhost").to_owned(),
-            device_id: device_id!("DEVICEID").to_owned(),
-        },
-        tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None },
-    };
-    let (client, server) = no_retry_test_client_with_server().await;
-    client.restore_session(session).await.unwrap();
-
+    let server = MockServer::start().await;
+    let client = test_utils::logged_in_client(Some(server.uri().to_string())).await;
     (client, server)
 }