diff --git a/tests/common/features/schema.rs b/tests/common/features/schema.rs
index e2855b557..12897ca89 100644
--- a/tests/common/features/schema.rs
+++ b/tests/common/features/schema.rs
@@ -1,5 +1,3 @@
-pub use super::super::bakery_chain::*;
-
 use super::*;
 use crate::common::setup::{create_enum, create_table, create_table_without_asserts};
 use sea_orm::{
diff --git a/tests/connection_tests.rs b/tests/connection_tests.rs
index ae0304d57..83abb1f98 100644
--- a/tests/connection_tests.rs
+++ b/tests/connection_tests.rs
@@ -2,8 +2,7 @@ pub mod common;
 
 pub use common::{bakery_chain::*, setup::*, TestContext};
 use pretty_assertions::assert_eq;
-pub use sea_orm::entity::*;
-pub use sea_orm::*;
+use sea_orm::prelude::*;
 
 #[sea_orm_macros::test]
 #[cfg(any(
diff --git a/tests/loader_tests.rs b/tests/loader_tests.rs
index 2db148a2c..c0cb408b1 100644
--- a/tests/loader_tests.rs
+++ b/tests/loader_tests.rs
@@ -1,7 +1,7 @@
 pub mod common;
 
 pub use common::{bakery_chain::*, setup::*, TestContext};
-pub use sea_orm::{entity::*, query::*, DbConn, DbErr, FromQueryResult};
+use sea_orm::{entity::*, query::*, DbConn, DbErr};
 
 #[sea_orm_macros::test]
 #[cfg(any(
diff --git a/tests/relational_tests.rs b/tests/relational_tests.rs
index 499275342..959f05577 100644
--- a/tests/relational_tests.rs
+++ b/tests/relational_tests.rs
@@ -4,8 +4,8 @@ pub use chrono::offset::Utc;
 pub use common::{bakery_chain::*, setup::*, TestContext};
 pub use rust_decimal::prelude::*;
 pub use rust_decimal_macros::dec;
-pub use sea_orm::{entity::*, query::*, DbErr, DerivePartialModel, FromQueryResult};
-pub use sea_query::{Alias, Expr, Func, SimpleExpr};
+use sea_orm::{entity::*, query::*, DbErr, DerivePartialModel, FromQueryResult};
+use sea_query::{Expr, Func, SimpleExpr};
 pub use uuid::Uuid;
 
 // Run the test locally:
diff --git a/tests/returning_tests.rs b/tests/returning_tests.rs
index 4f8389317..f6025c740 100644
--- a/tests/returning_tests.rs
+++ b/tests/returning_tests.rs
@@ -1,8 +1,8 @@
 pub mod common;
 
 pub use common::{bakery_chain::*, setup::*, TestContext};
-pub use sea_orm::{entity::prelude::*, *};
-pub use sea_query::Query;
+use sea_orm::entity::prelude::*;
+use sea_query::Query;
 
 #[sea_orm_macros::test]
 #[cfg(any(
diff --git a/tests/self_join_tests.rs b/tests/self_join_tests.rs
index a9c8fc0ed..afe444365 100644
--- a/tests/self_join_tests.rs
+++ b/tests/self_join_tests.rs
@@ -2,7 +2,7 @@ pub mod common;
 
 pub use common::{features::*, setup::*, TestContext};
 use pretty_assertions::assert_eq;
-use sea_orm::{entity::prelude::*, *};
+use sea_orm::{entity::prelude::*, IntoActiveModel, QueryOrder};
 
 #[sea_orm_macros::test]
 #[cfg(any(
diff --git a/tests/sequential_op_tests.rs b/tests/sequential_op_tests.rs
index 2b0ef97bc..208b388c6 100644
--- a/tests/sequential_op_tests.rs
+++ b/tests/sequential_op_tests.rs
@@ -4,9 +4,11 @@ pub use chrono::offset::Utc;
 pub use common::{bakery_chain::*, setup::*, TestContext};
 pub use rust_decimal::prelude::*;
 pub use rust_decimal_macros::dec;
-pub use sea_orm::{entity::*, query::*, DatabaseConnection, FromQueryResult};
 pub use uuid::Uuid;
 
+#[cfg(any(feature = "sqlx-mysql", feature = "sqlx-postgres"))]
+use sea_orm::{entity::*, query::*, DatabaseConnection, FromQueryResult};
+
 // Run the test locally:
 // DATABASE_URL="mysql://root:@localhost" cargo test --features sqlx-mysql,runtime-async-std --test sequential_op_tests
 #[sea_orm_macros::test]
diff --git a/tests/transaction_tests.rs b/tests/transaction_tests.rs
index 98643ef1c..ffc937a6d 100644
--- a/tests/transaction_tests.rs
+++ b/tests/transaction_tests.rs
@@ -2,8 +2,7 @@ pub mod common;
 
 pub use common::{bakery_chain::*, setup::*, TestContext};
 use pretty_assertions::assert_eq;
-pub use sea_orm::entity::*;
-pub use sea_orm::*;
+use sea_orm::{prelude::*, AccessMode, DatabaseTransaction, IsolationLevel, Set, TransactionTrait};
 
 #[sea_orm_macros::test]
 #[cfg(any(