diff --git a/tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp b/tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp
index b561cda63..63d74b215 100644
--- a/tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp
+++ b/tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp
@@ -23,13 +23,13 @@ using Orm::Exceptions::InvalidArgumentError;
 using Orm::Exceptions::InvalidFormatError;
 using Orm::SQLiteConnection;
 using Orm::TTimeZone;
-
-using Orm::Tiny::CastItem;
-using Orm::Tiny::CastType;
 using Orm::Utils::Helpers;
 
 using TypeUtils = Orm::Utils::Type;
 
+using Orm::Tiny::CastItem;
+using Orm::Tiny::CastType;
+
 using TestUtils::Databases;
 
 using Models::Type;
diff --git a/tests/auto/functional/orm/tiny/model/tst_model.cpp b/tests/auto/functional/orm/tiny/model/tst_model.cpp
index c7547fb32..3d503f882 100644
--- a/tests/auto/functional/orm/tiny/model/tst_model.cpp
+++ b/tests/auto/functional/orm/tiny/model/tst_model.cpp
@@ -29,10 +29,6 @@ using Orm::Constants::UPDATED_AT;
 
 using Orm::DB;
 using Orm::TTimeZone;
-using Orm::Tiny::ConnectionOverride;
-using Orm::Tiny::Exceptions::ModelNotFoundError;
-using Orm::Tiny::Model;
-using Orm::Tiny::Types::ModelsCollection;
 using Orm::Utils::Helpers;
 using Orm::Utils::NullVariant;
 
@@ -41,6 +37,11 @@ using TQueryError;
 using QueryUtils = Orm::Utils::Query;
 using TypeUtils = Orm::Utils::Type;
 
+using Orm::Tiny::ConnectionOverride;
+using Orm::Tiny::Exceptions::ModelNotFoundError;
+using Orm::Tiny::Model;
+using Orm::Tiny::Types::ModelsCollection;
+
 using TestUtils::Databases;
 
 using Models::Role;
diff --git a/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp b/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp
index ac9541d2b..2cd6d13d7 100644
--- a/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp
+++ b/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp
@@ -25,13 +25,13 @@ using Orm::DB;
 using Orm::QtTimeZoneConfig;
 using Orm::QtTimeZoneType;
 using Orm::TTimeZone;
-using Orm::Utils::NullVariant;
-
-using Orm::Tiny::ConnectionOverride;
 using Orm::Utils::Helpers;
+using Orm::Utils::NullVariant;
 
 using TypeUtils = Orm::Utils::Type;
 
+using Orm::Tiny::ConnectionOverride;
+
 using TestUtils::Databases;
 
 using Models::Datetime;
diff --git a/tests/auto/functional/orm/tiny/model_relations/tst_model_relations.cpp b/tests/auto/functional/orm/tiny/model_relations/tst_model_relations.cpp
index fe1f7c736..ffcaaab72 100644
--- a/tests/auto/functional/orm/tiny/model_relations/tst_model_relations.cpp
+++ b/tests/auto/functional/orm/tiny/model_relations/tst_model_relations.cpp
@@ -36,6 +36,10 @@ using Orm::One;
 using Orm::QtTimeZoneConfig;
 using Orm::QtTimeZoneType;
 using Orm::TTimeZone;
+using Orm::Utils::Helpers;
+
+using QueryUtils = Orm::Utils::Query;
+using TypeUtils = Orm::Utils::Type;
 
 using Orm::Tiny::AttributeItem;
 using Orm::Tiny::ConnectionOverride;
@@ -43,10 +47,6 @@ using Orm::Tiny::Exceptions::RelationMappingNotFoundError;
 using Orm::Tiny::Exceptions::RelationNotLoadedError;
 using Orm::Tiny::Relations::Pivot;
 using Orm::Tiny::Types::ModelsCollection;
-using Orm::Utils::Helpers;
-
-using QueryUtils = Orm::Utils::Query;
-using TypeUtils = Orm::Utils::Type;
 
 using TestUtils::Databases;
 
diff --git a/tests/auto/functional/orm/tiny/model_return_relation/tst_model_return_relation.cpp b/tests/auto/functional/orm/tiny/model_return_relation/tst_model_return_relation.cpp
index 8b98c00ab..1ecb487e0 100644
--- a/tests/auto/functional/orm/tiny/model_return_relation/tst_model_return_relation.cpp
+++ b/tests/auto/functional/orm/tiny/model_return_relation/tst_model_return_relation.cpp
@@ -10,12 +10,12 @@ using Orm::Constants::UPDATED_AT;
 
 using Orm::One;
 
+using TypeUtils = Orm::Utils::Type;
+
 using Orm::Tiny::ConnectionOverride;
 using Orm::Tiny::Relations::Pivot;
 using Orm::Tiny::Types::ModelsCollection;
 
-using TypeUtils = Orm::Utils::Type;
-
 using TestUtils::Databases;
 
 using Models::Tag;
diff --git a/tests/auto/functional/orm/tiny/queriesrelationships/tst_queriesrelationships.cpp b/tests/auto/functional/orm/tiny/queriesrelationships/tst_queriesrelationships.cpp
index 218beaa12..27343cd1d 100644
--- a/tests/auto/functional/orm/tiny/queriesrelationships/tst_queriesrelationships.cpp
+++ b/tests/auto/functional/orm/tiny/queriesrelationships/tst_queriesrelationships.cpp
@@ -11,12 +11,12 @@ using Orm::Constants::Progress;
 
 using Orm::QueryBuilder;
 
+using TypeUtils = Orm::Utils::Type;
+
 using Orm::Tiny::ConnectionOverride;
 using Orm::Tiny::Relations::Relation;
 using Orm::Tiny::TinyBuilder;
 
-using TypeUtils = Orm::Utils::Type;
-
 using TestUtils::Databases;
 
 using Models::FilePropertyProperty;
diff --git a/tests/auto/functional/orm/tiny/relations_buildsqueries/tst_relations_buildsqueries.cpp b/tests/auto/functional/orm/tiny/relations_buildsqueries/tst_relations_buildsqueries.cpp
index 3b9829767..4ceb9c72a 100644
--- a/tests/auto/functional/orm/tiny/relations_buildsqueries/tst_relations_buildsqueries.cpp
+++ b/tests/auto/functional/orm/tiny/relations_buildsqueries/tst_relations_buildsqueries.cpp
@@ -13,11 +13,11 @@ using Orm::Constants::dummy_NONEXISTENT;
 
 using Orm::One;
 
+using TypeUtils = Orm::Utils::Type;
+
 using Orm::Tiny::ConnectionOverride;
 using Orm::Tiny::Types::ModelsCollection;
 
-using TypeUtils = Orm::Utils::Type;
-
 using TestUtils::Databases;
 
 using Models::FilePropertyProperty;
diff --git a/tests/auto/functional/orm/tiny/relations_conn_indep/tst_relations_connection_independent.cpp b/tests/auto/functional/orm/tiny/relations_conn_indep/tst_relations_connection_independent.cpp
index 0686f9056..3df22b189 100644
--- a/tests/auto/functional/orm/tiny/relations_conn_indep/tst_relations_connection_independent.cpp
+++ b/tests/auto/functional/orm/tiny/relations_conn_indep/tst_relations_connection_independent.cpp
@@ -16,11 +16,12 @@ using Orm::Constants::SIZE_;
 using Orm::Constants::UPDATED_AT;
 
 using Orm::One;
-using Orm::Tiny::ConnectionOverride;
-using Orm::Tiny::Types::ModelsCollection;
 
 using TypeUtils = Orm::Utils::Type;
 
+using Orm::Tiny::ConnectionOverride;
+using Orm::Tiny::Types::ModelsCollection;
+
 using TestUtils::Databases;
 
 using Common = TestUtils::Common::Collection;
diff --git a/tests/auto/functional/orm/tiny/relations_insrt_updt/tst_relations_inserting_updating.cpp b/tests/auto/functional/orm/tiny/relations_insrt_updt/tst_relations_inserting_updating.cpp
index d71ddd044..0a2a423cb 100644
--- a/tests/auto/functional/orm/tiny/relations_insrt_updt/tst_relations_inserting_updating.cpp
+++ b/tests/auto/functional/orm/tiny/relations_insrt_updt/tst_relations_inserting_updating.cpp
@@ -19,14 +19,14 @@ using Orm::Constants::Updated_;
 
 using Orm::One;
 
-using Orm::Tiny::AttributeItem;
-using Orm::Tiny::ConnectionOverride;
-using Orm::Tiny::Types::ModelsCollection;
-
 using TQueryError;
 
 using TypeUtils = Orm::Utils::Type;
 
+using Orm::Tiny::AttributeItem;
+using Orm::Tiny::ConnectionOverride;
+using Orm::Tiny::Types::ModelsCollection;
+
 using TestUtils::Databases;
 
 using Models::Tag;
diff --git a/tests/auto/functional/orm/tiny/softdeletes/tst_softdeletes.cpp b/tests/auto/functional/orm/tiny/softdeletes/tst_softdeletes.cpp
index 2138df3d4..574dd6bb6 100644
--- a/tests/auto/functional/orm/tiny/softdeletes/tst_softdeletes.cpp
+++ b/tests/auto/functional/orm/tiny/softdeletes/tst_softdeletes.cpp
@@ -12,10 +12,10 @@ using Orm::Constants::NAME;
 using Orm::Constants::NOTE;
 using Orm::Constants::UPDATED_AT;
 
-using Orm::Tiny::ConnectionOverride;
-
 using TypeUtils = Orm::Utils::Type;
 
+using Orm::Tiny::ConnectionOverride;
+
 using TestUtils::Databases;
 
 using Models::Setting;
diff --git a/tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp b/tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp
index d364e788d..fdb87e38e 100644
--- a/tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp
+++ b/tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp
@@ -13,14 +13,15 @@ using Orm::Constants::SIZE_;
 
 using Orm::TTimeZone;
 
+using TQueryError;
+
+using TypeUtils = Orm::Utils::Type;
+
 using Orm::Tiny::ConnectionOverride;
 using Orm::Tiny::Exceptions::ModelNotFoundError;
 
-using TQueryError;
-
 template<typename Model>
 using TinyBuilder = Orm::Tiny::Builder<Model>;
-using TypeUtils = Orm::Utils::Type;
 
 using TestUtils::Databases;
 
diff --git a/tests/auto/unit/orm/tiny/mysql_tinybuilder/tst_mysql_tinybuilder.cpp b/tests/auto/unit/orm/tiny/mysql_tinybuilder/tst_mysql_tinybuilder.cpp
index 91aca6641..e66239cdf 100644
--- a/tests/auto/unit/orm/tiny/mysql_tinybuilder/tst_mysql_tinybuilder.cpp
+++ b/tests/auto/unit/orm/tiny/mysql_tinybuilder/tst_mysql_tinybuilder.cpp
@@ -19,14 +19,15 @@ using Orm::Constants::SIZE_;
 using Orm::DB;
 using Orm::Exceptions::InvalidArgumentError;
 using Orm::QueryBuilder;
-using Orm::Tiny::Model;
-using Orm::Tiny::TinyBuilder;
 using Orm::TTimeZone;
 using Orm::Utils::Helpers;
 using Orm::Utils::NullVariant;
 
 using TypeUtils = Orm::Utils::Type;
 
+using Orm::Tiny::Model;
+using Orm::Tiny::TinyBuilder;
+
 using TestUtils::Databases;
 
 using Models::FilePropertyProperty;