diff --git a/crates/api-types/src/social.rs b/crates/api-types/src/social.rs
index f7172b78..d899710f 100644
--- a/crates/api-types/src/social.rs
+++ b/crates/api-types/src/social.rs
@@ -77,7 +77,3 @@ pub struct FollowRelationResponse {
 pub struct PendingCountResponse {
     pub count: usize,
 }
-
-#[cfg(test)]
-#[path = "tests/social.rs"]
-mod tests;
diff --git a/crates/api-types/src/tests/social.rs b/crates/api-types/tests/social_dto_test.rs
similarity index 92%
rename from crates/api-types/src/tests/social.rs
rename to crates/api-types/tests/social_dto_test.rs
index 2e09621b..229b1195 100644
--- a/crates/api-types/src/tests/social.rs
+++ b/crates/api-types/tests/social_dto_test.rs
@@ -1,4 +1,4 @@
-use super::*;
+use api_types::social::FollowStateDto;
 
 #[test]
 fn follow_state_dto_serializes_to_lowercase_strings() {
diff --git a/crates/event-payload/src/lib.rs b/crates/event-payload/src/lib.rs
index 199c5290..92c32bff 100644
--- a/crates/event-payload/src/lib.rs
+++ b/crates/event-payload/src/lib.rs
@@ -718,7 +718,3 @@ impl TryFrom<EventPayload> for DomainEvent {
         }
     }
 }
-
-#[cfg(test)]
-#[path = "tests/lib.rs"]
-mod tests;
diff --git a/crates/event-payload/src/tests/lib.rs b/crates/event-payload/tests/event_payload_test.rs
similarity index 93%
rename from crates/event-payload/src/tests/lib.rs
rename to crates/event-payload/tests/event_payload_test.rs
index 6eb8b5c0..0f941bc5 100644
--- a/crates/event-payload/src/tests/lib.rs
+++ b/crates/event-payload/tests/event_payload_test.rs
@@ -1,4 +1,10 @@
-use super::*;
+use chrono::NaiveDateTime;
+use domain::{
+    events::DomainEvent,
+    value_objects::{ExternalMetadataId, MovieId, Rating, ReviewId, UserId},
+};
+use event_payload::EventPayload;
+use uuid::Uuid;
 
 fn fixed_dt() -> NaiveDateTime {
     chrono::DateTime::from_timestamp(1_700_000_000, 0)