diff --git a/Cargo.toml b/Cargo.toml
index 28926cb9..2ec87410 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,7 @@
 members = [
     "matrix_sdk",
     "matrix_sdk_base",
+    "matrix_sdk_test",
     "matrix_sdk_crypto",
     "matrix_sdk_common",
 ]
diff --git a/matrix_sdk_base/Cargo.toml b/matrix_sdk_base/Cargo.toml
index f2e3b5d6..9056089d 100644
--- a/matrix_sdk_base/Cargo.toml
+++ b/matrix_sdk_base/Cargo.toml
@@ -45,6 +45,7 @@ default-features = false
 features = ["sync", "time", "fs"]
 
 [dev-dependencies]
+matrix-sdk-test = { version = "0.1.0", path = "../matrix_sdk_test" }
 tokio = { version = "0.2.20", features = ["rt-threaded", "macros"] }
 ruma-identifiers = { version = "0.16.1", features = ["rand"] }
 serde_json = "1.0.52"
diff --git a/matrix_sdk_base/src/lib.rs b/matrix_sdk_base/src/lib.rs
index 97b5015a..fdc5173b 100644
--- a/matrix_sdk_base/src/lib.rs
+++ b/matrix_sdk_base/src/lib.rs
@@ -37,9 +37,6 @@ mod models;
 mod session;
 mod state;
 
-#[cfg(test)]
-pub mod test_builder;
-
 pub use base_client::{Client, RoomState, RoomStateType};
 pub use event_emitter::EventEmitter;
 #[cfg(feature = "encryption")]
diff --git a/matrix_sdk_base/src/models/room.rs b/matrix_sdk_base/src/models/room.rs
index 36832d96..9ee27183 100644
--- a/matrix_sdk_base/src/models/room.rs
+++ b/matrix_sdk_base/src/models/room.rs
@@ -524,8 +524,8 @@ mod test {
     use crate::api::r0::sync::sync_events::Response as SyncResponse;
     use crate::events::room::member::MembershipState;
     use crate::identifiers::UserId;
-    use crate::test_builder::EventBuilder;
     use crate::{Client, Session};
+    use matrix_sdk_test::EventBuilder;
 
     use http::Response;
 
diff --git a/matrix_sdk_base/src/models/room_member.rs b/matrix_sdk_base/src/models/room_member.rs
index dae638aa..e559b921 100644
--- a/matrix_sdk_base/src/models/room_member.rs
+++ b/matrix_sdk_base/src/models/room_member.rs
@@ -199,10 +199,11 @@ impl RoomMember {
 
 #[cfg(test)]
 mod test {
+    use matrix_sdk_test::EventBuilder;
+
     use crate::events::collections::all::RoomEvent;
     use crate::events::room::member::MembershipState;
     use crate::identifiers::{RoomId, UserId};
-    use crate::test_builder::EventBuilder;
     use crate::{Client, Session};
 
     use crate::js_int::Int;
diff --git a/matrix_sdk_test/Cargo.toml b/matrix_sdk_test/Cargo.toml
new file mode 100644
index 00000000..4106118c
--- /dev/null
+++ b/matrix_sdk_test/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+authors = ["Damir Jelić <poljar@termina.org.uk"]
+description = "Helpers to write tests for the Matrix SDK"
+edition = "2018"
+homepage = "https://github.com/matrix-org/matrix-rust-sdk"
+keywords = ["matrix", "chat", "messaging", "ruma"]
+license = "Apache-2.0"
+name = "matrix-sdk-test"
+readme = "README.md"
+repository = "https://github.com/matrix-org/matrix-rust-sdk"
+version = "0.1.0"
+
+[dependencies]
+serde_json = "1.0.52"
+http = "*"
+matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" }
diff --git a/matrix_sdk_base/src/test_builder.rs b/matrix_sdk_test/src/lib.rs
similarity index 98%
rename from matrix_sdk_base/src/test_builder.rs
rename to matrix_sdk_test/src/lib.rs
index 59f3c7b2..9fd49ddd 100644
--- a/matrix_sdk_base/src/test_builder.rs
+++ b/matrix_sdk_test/src/lib.rs
@@ -1,11 +1,12 @@
-#![cfg(test)]
-
+use std::convert::TryFrom;
 use std::fs;
 use std::panic;
 use std::path::Path;
 
-use crate::api::r0::sync::sync_events::Response as SyncResponse;
-use crate::events::{
+use http::Response;
+
+use matrix_sdk_common::api::r0::sync::sync_events::Response as SyncResponse;
+use matrix_sdk_common::events::{
     collections::{
         all::{RoomEvent, StateEvent},
         only::Event,
@@ -13,8 +14,6 @@ use crate::events::{
     presence::PresenceEvent,
     EventJson, TryFromRaw,
 };
-use http::Response;
-use std::convert::TryFrom;
 
 /// Easily create events to stream into either a Client or a `Room` for testing.
 #[derive(Default)]