diff --git a/frontend/rust-lib/event-integration/src/test_database.rs b/frontend/rust-lib/event-integration/src/database_event.rs
similarity index 100%
rename from frontend/rust-lib/event-integration/src/test_database.rs
rename to frontend/rust-lib/event-integration/src/database_event.rs
diff --git a/frontend/rust-lib/event-integration/src/test_document.rs b/frontend/rust-lib/event-integration/src/document_event.rs
similarity index 100%
rename from frontend/rust-lib/event-integration/src/test_document.rs
rename to frontend/rust-lib/event-integration/src/document_event.rs
diff --git a/frontend/rust-lib/event-integration/src/test_folder.rs b/frontend/rust-lib/event-integration/src/folder_event.rs
similarity index 100%
rename from frontend/rust-lib/event-integration/src/test_folder.rs
rename to frontend/rust-lib/event-integration/src/folder_event.rs
diff --git a/frontend/rust-lib/event-integration/src/lib.rs b/frontend/rust-lib/event-integration/src/lib.rs
index c7fe6c00d9..f99304eba9 100644
--- a/frontend/rust-lib/event-integration/src/lib.rs
+++ b/frontend/rust-lib/event-integration/src/lib.rs
@@ -9,14 +9,14 @@ use flowy_core::{AppFlowyCore, AppFlowyCoreConfig};
 use flowy_notification::register_notification_sender;
 use flowy_user::entities::AuthTypePB;
 
-use crate::test_user::TestNotificationSender;
+use crate::user_event::TestNotificationSender;
 
+pub mod database_event;
 pub mod document;
+pub mod document_event;
 pub mod event_builder;
-pub mod test_database;
-pub mod test_document;
-pub mod test_folder;
-pub mod test_user;
+pub mod folder_event;
+pub mod user_event;
 
 #[derive(Clone)]
 pub struct EventIntegrationTest {
diff --git a/frontend/rust-lib/event-integration/src/test_user.rs b/frontend/rust-lib/event-integration/src/user_event.rs
similarity index 100%
rename from frontend/rust-lib/event-integration/src/test_user.rs
rename to frontend/rust-lib/event-integration/src/user_event.rs
diff --git a/frontend/rust-lib/event-integration/tests/document/af_cloud_test/edit_test.rs b/frontend/rust-lib/event-integration/tests/document/af_cloud_test/edit_test.rs
index 772b345efa..d261cc26f0 100644
--- a/frontend/rust-lib/event-integration/tests/document/af_cloud_test/edit_test.rs
+++ b/frontend/rust-lib/event-integration/tests/document/af_cloud_test/edit_test.rs
@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use event_integration::test_document::assert_document_data_equal;
+use event_integration::document_event::assert_document_data_equal;
 use flowy_document2::entities::DocumentSyncStatePB;
 
 use crate::document::af_cloud_test::util::AFCloudDocumentTest;
diff --git a/frontend/rust-lib/event-integration/tests/document/supabase_test/edit_test.rs b/frontend/rust-lib/event-integration/tests/document/supabase_test/edit_test.rs
index 7300c3773b..a4ad36d350 100644
--- a/frontend/rust-lib/event-integration/tests/document/supabase_test/edit_test.rs
+++ b/frontend/rust-lib/event-integration/tests/document/supabase_test/edit_test.rs
@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use event_integration::test_document::assert_document_data_equal;
+use event_integration::document_event::assert_document_data_equal;
 use flowy_document2::entities::DocumentSyncStatePB;
 
 use crate::document::supabase_test::helper::FlowySupabaseDocumentTest;
diff --git a/frontend/rust-lib/event-integration/tests/user/local_test/auth_test.rs b/frontend/rust-lib/event-integration/tests/user/local_test/auth_test.rs
index 4866d36720..c5ee9c5560 100644
--- a/frontend/rust-lib/event-integration/tests/user/local_test/auth_test.rs
+++ b/frontend/rust-lib/event-integration/tests/user/local_test/auth_test.rs
@@ -1,4 +1,4 @@
-use event_integration::test_user::{login_password, unique_email};
+use event_integration::user_event::{login_password, unique_email};
 use event_integration::{event_builder::EventBuilder, EventIntegrationTest};
 use flowy_user::entities::{AuthTypePB, SignInPayloadPB, SignUpPayloadPB};
 use flowy_user::errors::ErrorCode;
diff --git a/frontend/rust-lib/flowy-database2/tests/database/database_editor.rs b/frontend/rust-lib/flowy-database2/tests/database/database_editor.rs
index 4d0a836332..9546bd4bf1 100644
--- a/frontend/rust-lib/flowy-database2/tests/database/database_editor.rs
+++ b/frontend/rust-lib/flowy-database2/tests/database/database_editor.rs
@@ -6,7 +6,7 @@ use collab_database::fields::Field;
 use collab_database::rows::{CreateRowParams, RowDetail, RowId};
 use strum::EnumCount;
 
-use event_integration::test_folder::ViewTest;
+use event_integration::folder_event::ViewTest;
 use event_integration::EventIntegrationTest;
 use flowy_database2::entities::{FieldType, FilterPB, RowMetaPB};
 use flowy_database2::services::cell::{CellBuilder, ToCellChangeset};