diff --git a/NOTES.txt b/NOTES.txt
index 5d4271b32..1c6a5e9cb 100644
--- a/NOTES.txt
+++ b/NOTES.txt
@@ -468,6 +468,7 @@ Common:
  - overflow           : add check code, eg when size_t to int conversion
  - perf               : performance
  - production         : check before deploy to production
+ - qt5 remove         : code to remove after the Qt v5 support will dropped
  - regex              : mark regex-es, try to avoid them
  - reliability        : make things more robust and reliable
  - repeat             : tasks that should I make from time to time
diff --git a/cmake/CommonModules/TinyCommon.cmake b/cmake/CommonModules/TinyCommon.cmake
index a0a56d35c..641e423bf 100644
--- a/cmake/CommonModules/TinyCommon.cmake
+++ b/cmake/CommonModules/TinyCommon.cmake
@@ -25,15 +25,18 @@ ${TINY_UNPARSED_ARGUMENTS}")
     # Qt defines
     # ---
 
+    # Disable deprecated APIs up to the given Qt version
+    # TODO qt5 remove silverqx
+    if(QT_VERSION_MAJOR GREATER_EQUAL 6)
+        # Disable all the APIs deprecated up to Qt 6.7.0
+        target_compile_definitions(${target} INTERFACE QT_DISABLE_DEPRECATED_UP_TO=0x060700)
+    else()
+        # Disable all the APIs deprecated up to Qt 6.0.0
+        target_compile_definitions(${target} INTERFACE QT_DISABLE_DEPRECATED_BEFORE=0x060000)
+    endif()
+
     target_compile_definitions(${target}
         INTERFACE
-            # You can also make your code fail to compile if it uses deprecated APIs.
-            # In order to do so, uncomment the following line.
-            # You can also select to disable deprecated APIs only up to a certain version
-            # of Qt.
-            # Disables all the APIs deprecated before Qt 6.0.0
-            QT_DISABLE_DEPRECATED_BEFORE=0x060000
-
             #QT_ASCII_CAST_WARNINGS
             #QT_NO_CAST_FROM_ASCII
             #QT_RESTRICTED_CAST_FROM_ASCII
diff --git a/qmake/common/common.pri b/qmake/common/common.pri
index fc4e6cdbf..0b75b8b46 100644
--- a/qmake/common/common.pri
+++ b/qmake/common/common.pri
@@ -6,6 +6,7 @@ load(tiny_dotenv)
 # Common Configuration ( also for tests )
 # ---
 
+# TODO qt5 remove silverqx
 versionAtLeast(QT_VERSION, 6.2.4): \
     CONFIG *= c++20
 else: \
@@ -19,11 +20,14 @@ CONFIG -= c++11 app_bundle
 # Qt defines
 # ---
 
-# You can also make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-# Disables all the APIs deprecated before Qt 6.0.0
-DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x060000
+# Disable deprecated APIs up to the given Qt version
+# Disable all the APIs deprecated up to Qt 6.7.0
+# TODO qt5 remove silverqx
+versionAtLeast(QT_VERSION, 6): \
+    DEFINES *= QT_DISABLE_DEPRECATED_UP_TO=0x060700
+# Disable all the APIs deprecated up to Qt 6.0.0
+else: \
+    DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x060000
 
 #DEFINES *= QT_ASCII_CAST_WARNINGS
 #DEFINES *= QT_NO_CAST_FROM_ASCII
diff --git a/tests/TinyUtils/CMakeLists.txt b/tests/TinyUtils/CMakeLists.txt
index 1b2053e8d..5e314f695 100644
--- a/tests/TinyUtils/CMakeLists.txt
+++ b/tests/TinyUtils/CMakeLists.txt
@@ -26,6 +26,7 @@ add_library(${TinyUtils_target}
     src/databases.hpp
     src/export.hpp
     src/fs.hpp
+    src/macros.hpp
     src/version.hpp
 
     src/databases.cpp
diff --git a/tests/TinyUtils/src/databases.cpp b/tests/TinyUtils/src/databases.cpp
index f2d34f08a..a643c38fe 100644
--- a/tests/TinyUtils/src/databases.cpp
+++ b/tests/TinyUtils/src/databases.cpp
@@ -12,6 +12,11 @@
 #  include "orm/exceptions/runtimeerror.hpp"
 #endif
 
+#ifndef sl
+/*! Alias for the QStringLiteral(). */
+#  define sl(str) QStringLiteral(str)
+#endif
+
 #ifdef TINYORM_USING_TINYDRIVERS
 using Orm::Drivers::SqlDatabase;
 #endif
diff --git a/tests/TinyUtils/src/databases.hpp b/tests/TinyUtils/src/databases.hpp
index d13e2d63a..f2e9d6fab 100644
--- a/tests/TinyUtils/src/databases.hpp
+++ b/tests/TinyUtils/src/databases.hpp
@@ -13,11 +13,6 @@
 
 #include "export.hpp"
 
-#ifndef sl
-/*! Alias for the QStringLiteral(). */
-#  define sl(str) QStringLiteral(str)
-#endif
-
 namespace Orm
 {
     class DatabaseManager;
diff --git a/tests/TinyUtils/src/macros.hpp b/tests/TinyUtils/src/macros.hpp
new file mode 100644
index 000000000..cf90787ce
--- /dev/null
+++ b/tests/TinyUtils/src/macros.hpp
@@ -0,0 +1,24 @@
+#pragma once
+#ifndef TINYUTILS_MACROS_HPP
+#define TINYUTILS_MACROS_HPP
+
+#include <QtGlobal>
+
+#ifndef sl
+/*! Alias for the QStringLiteral(). */
+#  define sl(str) QStringLiteral(str)
+#endif
+
+#ifndef TVERIFY_THROWS_EXCEPTION
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
+/*! Alias for QVERIFY_THROWS_EXCEPTION() (temporary workaround for Qt v6.8). */
+#    define TVERIFY_THROWS_EXCEPTION(exceptiontype, ...) \
+            QVERIFY_THROWS_EXCEPTION(exceptiontype, __VA_ARGS__)
+#  else
+/*! Alias for QVERIFY_EXCEPTION_THROWN(). */
+#    define TVERIFY_THROWS_EXCEPTION(exceptiontype, expression) \
+            QVERIFY_EXCEPTION_THROWN(expression, exceptiontype)
+#  endif
+#endif
+
+#endif // TINYUTILS_MACROS_HPP
diff --git a/tests/TinyUtils/src/src.pri b/tests/TinyUtils/src/src.pri
index 06ab6e28c..c346881f9 100644
--- a/tests/TinyUtils/src/src.pri
+++ b/tests/TinyUtils/src/src.pri
@@ -5,6 +5,7 @@ HEADERS += \
     $$PWD/databases.hpp \
     $$PWD/export.hpp \
     $$PWD/fs.hpp \
+    $$PWD/macros.hpp \
     $$PWD/version.hpp \
 
 SOURCES += \
diff --git a/tests/auto/functional/drivers/sqldatabasemanager/tst_sqldatabasemanager.cpp b/tests/auto/functional/drivers/sqldatabasemanager/tst_sqldatabasemanager.cpp
index 4d6c482fe..adf4a01ca 100644
--- a/tests/auto/functional/drivers/sqldatabasemanager/tst_sqldatabasemanager.cpp
+++ b/tests/auto/functional/drivers/sqldatabasemanager/tst_sqldatabasemanager.cpp
@@ -22,6 +22,7 @@ library.
 #include "orm/drivers/sqlquery.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using namespace Qt::StringLiterals; /* NOLINT(google-build-using-namespace) */
 
@@ -408,7 +409,7 @@ void tst_SqlDatabaseManager::MySQL_addExistingConnection_ThrowException() const
     QCOMPARE(Databases::driversConnectionNames().size(), 1);
     QVERIFY(Databases::driversOpenedConnectionNames().isEmpty());
 
-    QVERIFY_THROWS_EXCEPTION(
+    TVERIFY_THROWS_EXCEPTION(
                 InvalidArgumentError,
                 Databases::createDriversConnectionTemp(
                     Databases::MYSQL_DRIVERS,
@@ -463,7 +464,7 @@ void tst_SqlDatabaseManager::MySQL_enableOptionalMetadata_ThrowException() const
                                  u"CLIENT_OPTIONAL_RESULTSET_METADATA"_s}) // Must support option without the value (=ON/OFF; w/o value == ON)
                     .join(SEMICOLON));
 
-        QVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
+        TVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
 
         // Restore
         /* This will generate expected warning about the connection is still in use
@@ -496,7 +497,7 @@ void tst_SqlDatabaseManager::MySQL_enableOptionalMetadata_ThrowException() const
                                  u"MYSQL_OPT_OPTIONAL_RESULTSET_METADATA=ON"_s})
                     .join(SEMICOLON));
 
-        QVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
+        TVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
 
         // Restore
         /* This will generate expected warning about the connection is still in use
@@ -540,7 +541,7 @@ void tst_SqlDatabaseManager::MySQL_disableOptionalMetadata_CLIENT_OPTIONAL() con
                              u"CLIENT_OPTIONAL_RESULTSET_METADATA=OFF"_s}) // Must support option without the value (=ON/OFF; w/o value == ON)
                 .join(SEMICOLON));
 
-    QVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
+    TVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
 
     // Restore
     /* This will generate expected warning about the connection is still in use
@@ -628,7 +629,7 @@ void tst_SqlDatabaseManager::MySQL_MariaDB_disableOptionalMetadata_MYSQL_OPT() c
                              u"MYSQL_OPT_OPTIONAL_RESULTSET_METADATA=OFF"_s})
                 .join(SEMICOLON));
 
-    QVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
+    TVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
 
     // Restore
     /* This will generate expected warning about the connection is still in use
diff --git a/tests/auto/functional/drivers/sqlquery_normal/tst_sqlquery_normal.cpp b/tests/auto/functional/drivers/sqlquery_normal/tst_sqlquery_normal.cpp
index 4a30cd2f3..c2bae6017 100644
--- a/tests/auto/functional/drivers/sqlquery_normal/tst_sqlquery_normal.cpp
+++ b/tests/auto/functional/drivers/sqlquery_normal/tst_sqlquery_normal.cpp
@@ -10,6 +10,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using namespace Qt::StringLiterals; /* NOLINT(google-build-using-namespace) */
 
@@ -629,12 +630,12 @@ void tst_SqlQuery_Normal::finish_And_detachFromResultSet() const
     QVERIFY(users.isSelect());
     QVERIFY(!users.isValid());
     QCOMPARE(users.at(), BeforeFirstRow);
-    QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
+    TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
     // Behaves the same as the size() for SELECT queries
-    QVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
+    TVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
     QCOMPARE(users.numericalPrecisionPolicy(), LowPrecisionDouble);
     QCOMPARE(users.executedQuery(), query);
-    QVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
+    TVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
 
     QVERIFY(!users.next());
     QVERIFY(!users.previous());
@@ -902,12 +903,12 @@ void tst_SqlQuery_Normal::select_reExecute_SameQuery_AfterFinish() const
         QVERIFY(users.isSelect());
         QVERIFY(!users.isValid());
         QCOMPARE(users.at(), BeforeFirstRow);
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
         // Behaves the same as the size() for SELECT queries
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
         QCOMPARE(users.numericalPrecisionPolicy(), LowPrecisionDouble);
         QCOMPARE(users.executedQuery(), query);
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
 
         QVERIFY(!users.next());
         QVERIFY(!users.previous());
@@ -1019,12 +1020,12 @@ void tst_SqlQuery_Normal::select_executeAnotherQuery_OnSameInstance_AfterFinish(
         QVERIFY(query.isSelect());
         QVERIFY(!query.isValid());
         QCOMPARE(query.at(), BeforeFirstRow);
-        QVERIFY_THROWS_EXCEPTION(LogicError, query.size());
+        TVERIFY_THROWS_EXCEPTION(LogicError, query.size());
         // Behaves the same as the size() for SELECT queries
-        QVERIFY_THROWS_EXCEPTION(LogicError, query.numRowsAffected());
+        TVERIFY_THROWS_EXCEPTION(LogicError, query.numRowsAffected());
         QCOMPARE(query.numericalPrecisionPolicy(), LowPrecisionDouble);
         QCOMPARE(query.executedQuery(), queryString);
-        QVERIFY_THROWS_EXCEPTION(LogicError, query.lastInsertId());
+        TVERIFY_THROWS_EXCEPTION(LogicError, query.lastInsertId());
 
         QVERIFY(!query.next());
         QVERIFY(!query.previous());
@@ -1104,7 +1105,7 @@ void tst_SqlQuery_Normal::insert_update_delete() const
         QVERIFY(users.isActive());
         QVERIFY(!users.isSelect());
         QVERIFY(!users.isValid());
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
         QCOMPARE(users.numRowsAffected(), 1);
         QCOMPARE(users.executedQuery(), query);
 
@@ -1161,7 +1162,7 @@ void tst_SqlQuery_Normal::insert_update_delete() const
         QVERIFY(users.isActive());
         QVERIFY(!users.isSelect());
         QVERIFY(!users.isValid());
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
         QCOMPARE(users.numRowsAffected(), 1);
         QCOMPARE(users.executedQuery(), query);
     }
@@ -1210,7 +1211,7 @@ void tst_SqlQuery_Normal::insert_update_delete() const
         QVERIFY(users.isActive());
         QVERIFY(!users.isSelect());
         QVERIFY(!users.isValid());
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
         QCOMPARE(users.numRowsAffected(), 1);
         QCOMPARE(users.executedQuery(), query);
     }
diff --git a/tests/auto/functional/drivers/sqlquery_prepared/tst_sqlquery_prepared.cpp b/tests/auto/functional/drivers/sqlquery_prepared/tst_sqlquery_prepared.cpp
index 5db7fe2c3..051d66bdf 100644
--- a/tests/auto/functional/drivers/sqlquery_prepared/tst_sqlquery_prepared.cpp
+++ b/tests/auto/functional/drivers/sqlquery_prepared/tst_sqlquery_prepared.cpp
@@ -11,6 +11,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using namespace Qt::StringLiterals; /* NOLINT(google-build-using-namespace) */
 
@@ -434,7 +435,7 @@ void tst_SqlQuery_Prepared::select_BoundLessValues() const
     QCOMPARE(boundValues.size(), 1);
     QCOMPARE(boundValues, QVariantList {1});
 
-    QVERIFY_THROWS_EXCEPTION(QueryError, users.exec());
+    TVERIFY_THROWS_EXCEPTION(QueryError, users.exec());
 }
 
 namespace
@@ -779,12 +780,12 @@ void tst_SqlQuery_Prepared::finish_And_detachFromResultSet() const
     QVERIFY(users.isSelect());
     QVERIFY(!users.isValid());
     QCOMPARE(users.at(), BeforeFirstRow);
-    QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
+    TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
     // Behaves the same as the size() for SELECT queries
-    QVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
+    TVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
     QCOMPARE(users.numericalPrecisionPolicy(), LowPrecisionDouble);
     QCOMPARE(users.executedQuery(), query);
-    QVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
+    TVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
 
     // Test bound values
     {
@@ -1074,12 +1075,12 @@ void tst_SqlQuery_Prepared::select_reExecute_SameQuery_AfterFinish() const
         QVERIFY(users.isSelect());
         QVERIFY(!users.isValid());
         QCOMPARE(users.at(), BeforeFirstRow);
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
         // Behaves the same as the size() for SELECT queries
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
         QCOMPARE(users.numericalPrecisionPolicy(), LowPrecisionDouble);
         QCOMPARE(users.executedQuery(), query);
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
 
         // Test bound values
         QVERIFY(users.boundValues().isEmpty());
@@ -1197,12 +1198,12 @@ void tst_SqlQuery_Prepared::select_executeAnotherQuery_OnSameInstance_AfterFinis
         QVERIFY(query.isSelect());
         QVERIFY(!query.isValid());
         QCOMPARE(query.at(), BeforeFirstRow);
-        QVERIFY_THROWS_EXCEPTION(LogicError, query.size());
+        TVERIFY_THROWS_EXCEPTION(LogicError, query.size());
         // Behaves the same as the size() for SELECT queries
-        QVERIFY_THROWS_EXCEPTION(LogicError, query.numRowsAffected());
+        TVERIFY_THROWS_EXCEPTION(LogicError, query.numRowsAffected());
         QCOMPARE(query.numericalPrecisionPolicy(), LowPrecisionDouble);
         QCOMPARE(query.executedQuery(), queryString);
-        QVERIFY_THROWS_EXCEPTION(LogicError, query.lastInsertId());
+        TVERIFY_THROWS_EXCEPTION(LogicError, query.lastInsertId());
 
         // Test bound values
         QVERIFY(query.boundValues().isEmpty());
@@ -1568,12 +1569,12 @@ void tst_SqlQuery_Prepared::
         QVERIFY(users.isSelect());
         QVERIFY(!users.isValid());
         QCOMPARE(users.at(), BeforeFirstRow);
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
         // Behaves the same as the size() for SELECT queries
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
         QCOMPARE(users.numericalPrecisionPolicy(), LowPrecisionDouble);
         QCOMPARE(users.executedQuery(), query);
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
 
         QVERIFY(!users.next());
         QVERIFY(!users.previous());
@@ -1699,12 +1700,12 @@ void tst_SqlQuery_Prepared::
         QVERIFY(query.isSelect());
         QVERIFY(!query.isValid());
         QCOMPARE(query.at(), BeforeFirstRow);
-        QVERIFY_THROWS_EXCEPTION(LogicError, query.size());
+        TVERIFY_THROWS_EXCEPTION(LogicError, query.size());
         // Behaves the same as the size() for SELECT queries
-        QVERIFY_THROWS_EXCEPTION(LogicError, query.numRowsAffected());
+        TVERIFY_THROWS_EXCEPTION(LogicError, query.numRowsAffected());
         QCOMPARE(query.numericalPrecisionPolicy(), LowPrecisionDouble);
         QCOMPARE(query.executedQuery(), queryString);
-        QVERIFY_THROWS_EXCEPTION(LogicError, query.lastInsertId());
+        TVERIFY_THROWS_EXCEPTION(LogicError, query.lastInsertId());
 
         // Test bound values
         const auto boundValues = query.boundValues();
@@ -1816,7 +1817,7 @@ void tst_SqlQuery_Prepared::insert_update_delete() const
         QVERIFY(users.isActive());
         QVERIFY(!users.isSelect());
         QVERIFY(!users.isValid());
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
         QCOMPARE(users.numRowsAffected(), 1);
         QCOMPARE(users.executedQuery(), query);
 
@@ -1893,7 +1894,7 @@ void tst_SqlQuery_Prepared::insert_update_delete() const
         QVERIFY(users.isActive());
         QVERIFY(!users.isSelect());
         QVERIFY(!users.isValid());
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
         QCOMPARE(users.numRowsAffected(), 1);
         QCOMPARE(users.executedQuery(), query);
     }
@@ -1962,7 +1963,7 @@ void tst_SqlQuery_Prepared::insert_update_delete() const
         QVERIFY(users.isActive());
         QVERIFY(!users.isSelect());
         QVERIFY(!users.isValid());
-        QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
+        TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
         QCOMPARE(users.numRowsAffected(), 1);
         QCOMPARE(users.executedQuery(), query);
     }
diff --git a/tests/auto/functional/orm/databasemanager/tst_databasemanager.cpp b/tests/auto/functional/orm/databasemanager/tst_databasemanager.cpp
index 8f1fcc6c1..48c3b9950 100644
--- a/tests/auto/functional/orm/databasemanager/tst_databasemanager.cpp
+++ b/tests/auto/functional/orm/databasemanager/tst_databasemanager.cpp
@@ -7,6 +7,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using Orm::Constants::EMPTY;
 using Orm::Constants::NAME;
@@ -811,10 +812,10 @@ void tst_DatabaseManager::SQLite_CheckDatabaseExists_True() const
               .toUtf8().constData(), );
 
     // Verify
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                SQLiteDatabaseDoesNotExistError,
                 m_dm->connection(*connectionName)
-                .statement(sl("create table tbl1 (one varchar(10), two smallint)")),
-                SQLiteDatabaseDoesNotExistError);
+                .statement(sl("create table tbl1 (one varchar(10), two smallint)")));
 
     // Restore
     QVERIFY(Databases::removeConnection(*connectionName));
diff --git a/tests/auto/functional/orm/postgresql_connection/tst_postgresql_connection.cpp b/tests/auto/functional/orm/postgresql_connection/tst_postgresql_connection.cpp
index b0e0904ee..959a09a96 100644
--- a/tests/auto/functional/orm/postgresql_connection/tst_postgresql_connection.cpp
+++ b/tests/auto/functional/orm/postgresql_connection/tst_postgresql_connection.cpp
@@ -6,6 +6,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using Orm::Constants::EMPTY;
 using Orm::Constants::PUBLIC;
diff --git a/tests/auto/functional/orm/query/blobs/tst_blobs.cpp b/tests/auto/functional/orm/query/blobs/tst_blobs.cpp
index d9f8c837e..66377135f 100644
--- a/tests/auto/functional/orm/query/blobs/tst_blobs.cpp
+++ b/tests/auto/functional/orm/query/blobs/tst_blobs.cpp
@@ -7,6 +7,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using Orm::Constants::QMYSQL;
 using Orm::Constants::text_;
diff --git a/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp b/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp
index 770dc12a4..70e8cfb44 100644
--- a/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp
+++ b/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp
@@ -10,6 +10,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using Orm::Constants::ID;
 using Orm::Constants::QMYSQL;
diff --git a/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp b/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp
index e104002a9..fed7781ed 100644
--- a/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp
+++ b/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp
@@ -10,6 +10,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using Orm::Constants::ID;
 using Orm::Constants::UTC;
diff --git a/tests/auto/functional/orm/query/querybuilder/tst_querybuilder.cpp b/tests/auto/functional/orm/query/querybuilder/tst_querybuilder.cpp
index 825a02934..a3ac2c666 100644
--- a/tests/auto/functional/orm/query/querybuilder/tst_querybuilder.cpp
+++ b/tests/auto/functional/orm/query/querybuilder/tst_querybuilder.cpp
@@ -11,6 +11,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using Orm::Constants::ASTERISK;
 using Orm::Constants::COMMA;
@@ -1224,12 +1225,12 @@ void tst_QueryBuilder::upsert_EmptyUpdate() const
 {
     QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
 
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                InvalidArgumentError,
                 createQuery(connection)->from("tag_properties")
                 .upsert({{{"tag_id", 1}, {"color", "pink"},   {"position", 0}},
                          {{"tag_id", 1}, {"color", "purple"}, {"position", 4}}},
-                        {"position"}, {}),
-                InvalidArgumentError);
+                        {"position"}, {}));
 }
 
 void tst_QueryBuilder::upsert_WithoutUpdate_UpdateAll() const
@@ -1583,20 +1584,20 @@ void tst_QueryBuilder::sole_RecordsNotFoundError() const
 {
     QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
 
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+            RecordsNotFoundError,
             createQuery(connection)->from("torrents")
                 .whereEq(NAME, dummy_NONEXISTENT)
-                .sole(),
-            RecordsNotFoundError);
+                .sole());
 }
 
 void tst_QueryBuilder::sole_MultipleRecordsFoundError() const
 {
     QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
 
-    QVERIFY_EXCEPTION_THROWN(
-            createQuery(connection)->from("torrents").whereEq("user_id", 1).sole(),
-            MultipleRecordsFoundError);
+    TVERIFY_THROWS_EXCEPTION(
+            MultipleRecordsFoundError,
+            createQuery(connection)->from("torrents").whereEq("user_id", 1).sole());
 }
 
 void tst_QueryBuilder::soleValue() const
@@ -1615,22 +1616,22 @@ void tst_QueryBuilder::soleValue_RecordsNotFoundError() const
 {
     QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
 
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+            RecordsNotFoundError,
             createQuery(connection)->from("torrents")
                 .whereEq(NAME, dummy_NONEXISTENT)
-                .soleValue(NAME),
-            RecordsNotFoundError);
+                .soleValue(NAME));
 }
 
 void tst_QueryBuilder::soleValue_MultipleRecordsFoundError() const
 {
     QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
 
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+            MultipleRecordsFoundError,
             createQuery(connection)->from("torrents")
                 .whereEq("user_id", 1)
-                .soleValue(NAME),
-            MultipleRecordsFoundError);
+                .soleValue(NAME));
 }
 
 void tst_QueryBuilder::chunk() const
@@ -1719,12 +1720,13 @@ void tst_QueryBuilder::chunk_EnforceOrderBy() const
 {
     QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
 
-    QVERIFY_EXCEPTION_THROWN(createQuery(connection)->from("file_property_properties")
-                             .chunk(3, [](SqlQuery &/*unused*/, const qint64 /*unused*/)
+    TVERIFY_THROWS_EXCEPTION(
+            RuntimeError,
+            createQuery(connection)->from("file_property_properties")
+                        .chunk(3, [](SqlQuery &/*unused*/, const qint64 /*unused*/)
     {
         return true;
-    }),
-        RuntimeError);
+    }));
 }
 
 void tst_QueryBuilder::chunk_EmptyResult() const
@@ -1812,12 +1814,13 @@ void tst_QueryBuilder::each_EnforceOrderBy() const
 {
     QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
 
-    QVERIFY_EXCEPTION_THROWN(createQuery(connection)->from("file_property_properties")
-                             .each([](SqlQuery &/*unused*/, const qint64 /*unused*/)
+    TVERIFY_THROWS_EXCEPTION(
+            RuntimeError,
+            createQuery(connection)->from("file_property_properties")
+                        .each([](SqlQuery &/*unused*/, const qint64 /*unused*/)
     {
         return true;
-    }),
-        RuntimeError);
+    }));
 }
 
 void tst_QueryBuilder::each_EmptyResult() const
diff --git a/tests/auto/functional/orm/schema/psql_schemabuilder_f/tst_postgresql_schemabuilder_f.cpp b/tests/auto/functional/orm/schema/psql_schemabuilder_f/tst_postgresql_schemabuilder_f.cpp
index e9378817e..ea64f2219 100644
--- a/tests/auto/functional/orm/schema/psql_schemabuilder_f/tst_postgresql_schemabuilder_f.cpp
+++ b/tests/auto/functional/orm/schema/psql_schemabuilder_f/tst_postgresql_schemabuilder_f.cpp
@@ -8,6 +8,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using Orm::Constants::PUBLIC;
 using Orm::Constants::search_path;
@@ -108,9 +109,9 @@ void tst_PostgreSQL_SchemaBuilder_f::
               .toUtf8().constData(), );
 
     // Verify
-    QVERIFY_EXCEPTION_THROWN(
-                Schema::on(*connectionName).hasTable(sl("users")),
-                SearchPathEmptyError);
+    TVERIFY_THROWS_EXCEPTION(
+                SearchPathEmptyError,
+                Schema::on(*connectionName).hasTable(sl("users")));
 
     // Restore
     QVERIFY(Databases::removeConnection(*connectionName));
diff --git a/tests/auto/functional/orm/schema/schemabuilder/tst_schemabuilder.cpp b/tests/auto/functional/orm/schema/schemabuilder/tst_schemabuilder.cpp
index 7e7600e3c..b9734dff5 100644
--- a/tests/auto/functional/orm/schema/schemabuilder/tst_schemabuilder.cpp
+++ b/tests/auto/functional/orm/schema/schemabuilder/tst_schemabuilder.cpp
@@ -9,6 +9,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 namespace fs = std::filesystem;
 
diff --git a/tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp b/tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp
index 820184c1d..c34edca8d 100644
--- a/tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp
+++ b/tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp
@@ -9,6 +9,7 @@
 #include "orm/utils/helpers.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/type.hpp"
 
@@ -509,8 +510,8 @@ void tst_CastAttributes::cast_QByteArray_to_QDateTime_ThrowException() const
 
     type.mergeCasts({{"binary", CastType::QDateTime}});
 
-    QVERIFY_EXCEPTION_THROWN(type.getAttribute("binary"),
-                             InvalidFormatError);
+    TVERIFY_THROWS_EXCEPTION(InvalidFormatError,
+                             type.getAttribute("binary"));
 }
 
 void tst_CastAttributes::cast_QDateTime_to_QByteArray_ThrowException() const
@@ -525,8 +526,8 @@ void tst_CastAttributes::cast_QDateTime_to_QByteArray_ThrowException() const
 
     type.mergeCasts({{"datetime", CastType::QByteArray}});
 
-    QVERIFY_EXCEPTION_THROWN(type.getAttribute("datetime"),
-                             InvalidArgumentError);
+    TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
+                             type.getAttribute("datetime"));
 }
 
 /* Default casts */
diff --git a/tests/auto/functional/orm/tiny/collection_models/tst_collection_models.cpp b/tests/auto/functional/orm/tiny/collection_models/tst_collection_models.cpp
index ce8a5f7bf..3a6c78c22 100644
--- a/tests/auto/functional/orm/tiny/collection_models/tst_collection_models.cpp
+++ b/tests/auto/functional/orm/tiny/collection_models/tst_collection_models.cpp
@@ -6,6 +6,7 @@
 
 #include "common/collection.hpp"
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/albumimage.hpp"
 
@@ -2666,8 +2667,8 @@ void tst_Collection_Models::load_lvalue_NonExistentRelation_Failed() const
     // Verify before
     verify();
 
-    QVERIFY_EXCEPTION_THROWN(albums.load("albumImages-NON_EXISTENT"),
-                             RelationMappingNotFoundError);
+    TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
+                             albums.load("albumImages-NON_EXISTENT"));
 
     // Verify after
     verify();
@@ -2905,8 +2906,8 @@ void tst_Collection_Models::load_rvalue_NonExistentRelation_Failed() const
     // Verify before
     verify();
 
-    QVERIFY_EXCEPTION_THROWN(std::move(albums).load("albumImages-NON_EXISTENT"),
-                             RelationMappingNotFoundError);
+    TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
+                             std::move(albums).load("albumImages-NON_EXISTENT"));
 
     // Verify after
     verify();
@@ -3132,8 +3133,8 @@ void tst_Collection_Models::where_InvalidComparisonOperator_ThrowException() con
     QVERIFY(Common::verifyIds(images, {2, 3, 4, 5, 6}));
 
     // Verify
-    QVERIFY_EXCEPTION_THROWN(images.where(ID, dummy_NONEXISTENT, 10),
-                             InvalidArgumentError);
+    TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
+                             images.where(ID, dummy_NONEXISTENT, 10));
 }
 
 void tst_Collection_Models::whereNull_QString() const
diff --git a/tests/auto/functional/orm/tiny/collection_relations/tst_collection_relations.cpp b/tests/auto/functional/orm/tiny/collection_relations/tst_collection_relations.cpp
index 08788b518..3948af836 100644
--- a/tests/auto/functional/orm/tiny/collection_relations/tst_collection_relations.cpp
+++ b/tests/auto/functional/orm/tiny/collection_relations/tst_collection_relations.cpp
@@ -6,6 +6,7 @@
 
 #include "common/collection.hpp"
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/album.hpp"
 
@@ -3116,8 +3117,8 @@ void tst_Collection_Relations::load_lvalue_NonExistentRelation_Failed() const
     // Verify before
     verify();
 
-    QVERIFY_EXCEPTION_THROWN(albumsInit.load("albumImages-NON_EXISTENT"),
-                             RelationMappingNotFoundError);
+    TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
+                             albumsInit.load("albumImages-NON_EXISTENT"));
 
     // Verify after
     verify();
@@ -3377,8 +3378,8 @@ void tst_Collection_Relations::load_rvalue_NonExistentRelation_Failed() const
     // Verify before
     verify();
 
-    QVERIFY_EXCEPTION_THROWN(std::move(albumsInit).load("albumImages-NON_EXISTENT"),
-                             RelationMappingNotFoundError);
+    TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
+                             std::move(albumsInit).load("albumImages-NON_EXISTENT"));
 
     // Verify after
     verify();
@@ -3652,8 +3653,8 @@ void tst_Collection_Relations::where_InvalidComparisonOperator_ThrowException()
     QVERIFY(Common::verifyIds(images, {2, 3, 4, 5, 6}));
 
     // Verify
-    QVERIFY_EXCEPTION_THROWN(images.where(ID, dummy_NONEXISTENT, 10),
-                             InvalidArgumentError);
+    TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
+                             images.where(ID, dummy_NONEXISTENT, 10));
 }
 
 void tst_Collection_Relations::whereNull_QString() const
diff --git a/tests/auto/functional/orm/tiny/model/tst_model.cpp b/tests/auto/functional/orm/tiny/model/tst_model.cpp
index 4dcf0405c..e96f77881 100644
--- a/tests/auto/functional/orm/tiny/model/tst_model.cpp
+++ b/tests/auto/functional/orm/tiny/model/tst_model.cpp
@@ -9,6 +9,7 @@
 #include "orm/utils/query.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/massassignmentmodels.hpp"
 #include "models/setting.hpp"
@@ -389,7 +390,7 @@ void tst_Model::save_Update_Failed() const
 
     peer->setAttribute("total_seeds-NON_EXISTENT", 15);
 
-    QVERIFY_EXCEPTION_THROWN(peer->save(), QueryError);
+    TVERIFY_THROWS_EXCEPTION(QueryError, peer->save());
 
     QVERIFY(peer->exists);
 }
@@ -832,10 +833,8 @@ void tst_Model::findOrFail_NotFoundFailed() const
 
     ConnectionOverride::connection = connection;
 
-    QVERIFY_EXCEPTION_THROWN(Torrent::findOrFail(999999),
-                             ModelNotFoundError);
-    QVERIFY_EXCEPTION_THROWN(Torrent::findOrFail(999999, {ID, NAME}),
-                             ModelNotFoundError);
+    TVERIFY_THROWS_EXCEPTION(ModelNotFoundError, Torrent::findOrFail(999999));
+    TVERIFY_THROWS_EXCEPTION(ModelNotFoundError, Torrent::findOrFail(999999, {ID, NAME}));
 }
 
 void tst_Model::findMany() const
@@ -1351,13 +1350,14 @@ void tst_Model::create_Failed() const
     const auto addedOn = QDateTime({2021, 2, 1}, {20, 22, 10}, Qt::UTC);
 
     Torrent torrent;
-    QVERIFY_EXCEPTION_THROWN((torrent = Torrent::create({
+    TVERIFY_THROWS_EXCEPTION(QueryError,
+    (torrent = Torrent::create({
         {"name-NON_EXISTENT", "test100"},
         {SIZE_,               100},
         {Progress,            333},
         {"added_on",          addedOn},
         {HASH_,               "1009e3af2768cdf52ec84c1f320333f68401dc6e"},
-    })), QueryError);
+    })));
 
     QVERIFY(!torrent.exists);
     QVERIFY(torrent.getAttributes().isEmpty());
diff --git a/tests/auto/functional/orm/tiny/model_appends/tst_model_appends.cpp b/tests/auto/functional/orm/tiny/model_appends/tst_model_appends.cpp
index 5730141bb..e279ef8b9 100644
--- a/tests/auto/functional/orm/tiny/model_appends/tst_model_appends.cpp
+++ b/tests/auto/functional/orm/tiny/model_appends/tst_model_appends.cpp
@@ -2,6 +2,7 @@
 #include <QtTest>
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/datetime_serializeoverride.hpp"
 #include "models/torrent.hpp"
diff --git a/tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp b/tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp
index 1c0e41b15..a2d04954c 100644
--- a/tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp
+++ b/tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp
@@ -4,6 +4,7 @@
 #include "orm/db.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/datetime.hpp"
 #include "models/filepropertyproperty.hpp"
@@ -208,18 +209,18 @@ void tst_Model_Connection_Independent::
 defaultAttributeValues_WithQDateTime_DefaultCtor() const
 {
     // Default ctor must throw because of the QDateTime
-    QVERIFY_EXCEPTION_THROWN(TorrentEager(), InvalidArgumentError);
+    TVERIFY_THROWS_EXCEPTION(InvalidArgumentError, TorrentEager());
 }
 
 void tst_Model_Connection_Independent::
 defaultAttributeValues_WithQDateTime_ConvertingAttributesCtor() const
 {
     // Attributes converting ctor must throw because of the QDateTime
-    QVERIFY_EXCEPTION_THROWN(TorrentEager({
+    TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
+                             TorrentEager({
                                  {NAME, "test22"},
                                  {NOTE, "Torrent::instance()"},
-                             }),
-                             InvalidArgumentError);
+                             }));
 }
 
 void tst_Model_Connection_Independent::
@@ -227,11 +228,11 @@ defaultAttributeValues_WithQDateTime_ListInitializationCtor() const
 {
     /* List initialization using the std::initializer_list<AttributeItem> must throw
        because of the QDateTime. */
-    QVERIFY_EXCEPTION_THROWN((TorrentEager {
+    TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
+                             (TorrentEager {
                                  {NAME, "test22"},
                                  {NOTE, "Torrent::instance()"},
-                             }),
-                             InvalidArgumentError);
+                             }));
 }
 
 void tst_Model_Connection_Independent::
@@ -963,8 +964,7 @@ tst_Model_Connection_Independent::massAssignment_TotallyGuarded_Exception() cons
     Torrent_TotallyGuarded torrent;
 
     QVERIFY(!torrent.exists);
-    QVERIFY_EXCEPTION_THROWN(torrent.fill({{NAME, "test150"}}),
-                             MassAssignmentError);
+    TVERIFY_THROWS_EXCEPTION(MassAssignmentError, torrent.fill({{NAME, "test150"}}));
 }
 
 void tst_Model_Connection_Independent::
@@ -2217,16 +2217,16 @@ void tst_Model_Connection_Independent::sole() const
 
 void tst_Model_Connection_Independent::sole_RecordsNotFoundError() const
 {
-    QVERIFY_EXCEPTION_THROWN(
-            FilePropertyProperty::whereEq(NAME, dummy_NONEXISTENT)->sole(),
-            RecordsNotFoundError);
+    TVERIFY_THROWS_EXCEPTION(
+            RecordsNotFoundError,
+            FilePropertyProperty::whereEq(NAME, dummy_NONEXISTENT)->sole());
 }
 
 void tst_Model_Connection_Independent::sole_MultipleRecordsFoundError() const
 {
-    QVERIFY_EXCEPTION_THROWN(
-            FilePropertyProperty::whereEq("file_property_id", 5)->sole(),
-            MultipleRecordsFoundError);
+    TVERIFY_THROWS_EXCEPTION(
+            MultipleRecordsFoundError,
+            FilePropertyProperty::whereEq("file_property_id", 5)->sole());
 }
 
 void tst_Model_Connection_Independent::sole_Pretending() const
@@ -2257,16 +2257,16 @@ void tst_Model_Connection_Independent::soleValue() const
 
 void tst_Model_Connection_Independent::soleValue_RecordsNotFoundError() const
 {
-    QVERIFY_EXCEPTION_THROWN(
-            FilePropertyProperty::whereEq(NAME, dummy_NONEXISTENT)->soleValue(NAME),
-            RecordsNotFoundError);
+    TVERIFY_THROWS_EXCEPTION(
+            RecordsNotFoundError,
+            FilePropertyProperty::whereEq(NAME, dummy_NONEXISTENT)->soleValue(NAME));
 }
 
 void tst_Model_Connection_Independent::soleValue_MultipleRecordsFoundError() const
 {
-    QVERIFY_EXCEPTION_THROWN(
-            FilePropertyProperty::soleValue(NAME),
-            MultipleRecordsFoundError);
+    TVERIFY_THROWS_EXCEPTION(
+            MultipleRecordsFoundError,
+            FilePropertyProperty::soleValue(NAME));
 }
 
 void tst_Model_Connection_Independent::soleValue_Pretending() const
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 bd30cd58b..a4a417856 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
@@ -6,6 +6,7 @@
 #include "orm/utils/nullvariant.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/datetime.hpp"
 
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 773f264bc..c532509eb 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
@@ -5,6 +5,7 @@
 #include "orm/utils/query.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/torrent.hpp"
 #include "models/torrenteager.hpp"
@@ -410,25 +411,25 @@ void tst_Model_Relations::getRelation_EagerLoad_Failed() const
     Torrent torrent;
 
     // Many relation
-    QVERIFY_EXCEPTION_THROWN(
-                (torrent.getRelation<TorrentPreviewableFile>("torrentFiles")),
-                RelationNotLoadedError);
+    TVERIFY_THROWS_EXCEPTION(
+                RelationNotLoadedError,
+                (torrent.getRelation<TorrentPreviewableFile>("torrentFiles")));
     // One relation, obtained as QVector, also possible
-    QVERIFY_EXCEPTION_THROWN(
-                (torrent.getRelation<TorrentPeer>("torrentFiles")),
-                RelationNotLoadedError);
+    TVERIFY_THROWS_EXCEPTION(
+                RelationNotLoadedError,
+                (torrent.getRelation<TorrentPeer>("torrentFiles")));
     // Many relation
-    QVERIFY_EXCEPTION_THROWN(
-                (torrent.getRelation<TorrentPeer, One>("torrentFiles")),
-                RelationNotLoadedError);
+    TVERIFY_THROWS_EXCEPTION(
+                RelationNotLoadedError,
+                (torrent.getRelation<TorrentPeer, One>("torrentFiles")));
     // BelongsTo relation
-    QVERIFY_EXCEPTION_THROWN(
-                (TorrentPeer().getRelation<Torrent, One>("torrent")),
-                RelationNotLoadedError);
+    TVERIFY_THROWS_EXCEPTION(
+                RelationNotLoadedError,
+                (TorrentPeer().getRelation<Torrent, One>("torrent")));
     // BelongsToMany relation
-    QVERIFY_EXCEPTION_THROWN(
-                (torrent.getRelation<Tag>("tags")),
-                RelationNotLoadedError);
+    TVERIFY_THROWS_EXCEPTION(
+                RelationNotLoadedError,
+                (torrent.getRelation<Tag>("tags")));
 }
 
 void tst_Model_Relations::eagerLoad_Failed() const
@@ -437,8 +438,8 @@ void tst_Model_Relations::eagerLoad_Failed() const
 
     ConnectionOverride::connection = connection;
 
-    QVERIFY_EXCEPTION_THROWN(TorrentEager_Failed::find(1),
-                             RelationMappingNotFoundError);
+    TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
+                             TorrentEager_Failed::find(1));
 }
 
 void tst_Model_Relations::getRelationValue_LazyLoad_ManyAndOne() const
@@ -926,10 +927,10 @@ void tst_Model_Relations::with_Vector_MoreRelations() const
         QCOMPARE(typeid (file), typeid (TorrentPreviewableFile *));
 
         // No TorrentPreviewableFileProperty loaded
-        QVERIFY_EXCEPTION_THROWN(
+        TVERIFY_THROWS_EXCEPTION(
+                    RuntimeError,
                     (file->getRelation<TorrentPreviewableFileProperty, One>(
-                         "fileProperty")),
-                    RuntimeError);
+                         "fileProperty")));
     }
 }
 
@@ -939,8 +940,8 @@ void tst_Model_Relations::with_NonExistentRelation_Failed() const
 
     ConnectionOverride::connection = connection;
 
-    QVERIFY_EXCEPTION_THROWN(Torrent::with("torrentFiles-NON_EXISTENT")->find(1),
-                             RelationMappingNotFoundError);
+    TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
+                             Torrent::with("torrentFiles-NON_EXISTENT")->find(1));
 }
 
 void tst_Model_Relations::with_WithSelectConstraint() const
@@ -1781,8 +1782,8 @@ void tst_Model_Relations::load_NonExistentRelation_Failed() const
 
     QVERIFY(torrent->getRelations().empty());
 
-    QVERIFY_EXCEPTION_THROWN(torrent->load("torrentFiles-NON_EXISTENT"),
-                             RelationMappingNotFoundError);
+    TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
+                             torrent->load("torrentFiles-NON_EXISTENT"));
     QVERIFY(torrent->getRelations().empty());
 }
 
diff --git a/tests/auto/functional/orm/tiny/model_serialization/tst_model_serialization.cpp b/tests/auto/functional/orm/tiny/model_serialization/tst_model_serialization.cpp
index f29917c6e..de8380838 100644
--- a/tests/auto/functional/orm/tiny/model_serialization/tst_model_serialization.cpp
+++ b/tests/auto/functional/orm/tiny/model_serialization/tst_model_serialization.cpp
@@ -2,6 +2,7 @@
 #include <QtTest>
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/album.hpp"
 #include "models/datetime.hpp"
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 9c2a7a633..3b9829767 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
@@ -2,6 +2,7 @@
 #include <QtTest>
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/torrent.hpp"
 
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 0f14115cf..d71ddd044 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
@@ -2,6 +2,7 @@
 #include <QtTest>
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/torrent.hpp"
 #include "models/torrentpreviewablefile.hpp"
@@ -233,8 +234,7 @@ void tst_Relations_Inserting_Updating::save_OnHasOneOrMany_Failed() const
     });
     QVERIFY(!file.exists);
 
-    QVERIFY_EXCEPTION_THROWN(torrent->torrentFiles()->save(file),
-                             QueryError);
+    TVERIFY_THROWS_EXCEPTION(QueryError, torrent->torrentFiles()->save(file));
     QVERIFY(!file.exists);
     QVERIFY(!file[ID]->isValid());
     QCOMPARE(file["torrent_id"], QVariant(1));
@@ -403,8 +403,8 @@ void tst_Relations_Inserting_Updating::saveMany_OnHasOneOrMany_Failed() const
         std::move(file2),
     };
     ModelsCollection<TorrentPreviewableFile> savedFiles;
-    QVERIFY_EXCEPTION_THROWN(savedFiles = torrent->torrentFiles()->saveMany(filesToSave),
-                             QueryError);
+    TVERIFY_THROWS_EXCEPTION(QueryError,
+                             savedFiles = torrent->torrentFiles()->saveMany(filesToSave));
     QVERIFY(savedFiles.isEmpty());
 }
 
@@ -503,8 +503,8 @@ void tst_Relations_Inserting_Updating::create_OnHasOneOrMany_Failed() const
     };
     TorrentPreviewableFile file;
 
-    QVERIFY_EXCEPTION_THROWN(file = torrent->torrentFiles()->create(fileAttribtues),
-                             QueryError);
+    TVERIFY_THROWS_EXCEPTION(QueryError,
+                             file = torrent->torrentFiles()->create(fileAttribtues));
     QVERIFY(!file.exists);
     QVERIFY(file.getAttributes().isEmpty());
 }
@@ -521,13 +521,14 @@ void tst_Relations_Inserting_Updating::create_OnHasOneOrMany_WithRValue_Failed()
 
     TorrentPreviewableFile file;
 
-    QVERIFY_EXCEPTION_THROWN(file = torrent->torrentFiles()->create({
-        {"file_index", 1},
-        {"filepath",   "test1_file1.mkv"},
-        {SIZE_,        377477},
-        {Progress,     222},
-        {NOTE,         "relation's save fail"},
-    }), QueryError);
+    TVERIFY_THROWS_EXCEPTION(QueryError,
+            file = torrent->torrentFiles()->create({
+                {"file_index", 1},
+                {"filepath",   "test1_file1.mkv"},
+                {SIZE_,        377477},
+                {Progress,     222},
+                {NOTE,         "relation's save fail"},
+            }));
 
     QVERIFY(!file.exists);
     QVERIFY(file.getAttributes().isEmpty());
@@ -689,9 +690,9 @@ void tst_Relations_Inserting_Updating::createMany_OnHasOneOrMany_Failed() const
     };
 
     ModelsCollection<TorrentPreviewableFile> savedFiles;
-    QVERIFY_EXCEPTION_THROWN(savedFiles = torrent->torrentFiles()
-                                          ->createMany(fileAttributesToSave),
-                             QueryError);
+    TVERIFY_THROWS_EXCEPTION(QueryError,
+                             savedFiles = torrent->torrentFiles()
+                                          ->createMany(fileAttributesToSave));
     QVERIFY(savedFiles.isEmpty());
 }
 
@@ -707,7 +708,7 @@ tst_Relations_Inserting_Updating::createMany_OnHasOneOrMany_WithRValue_Failed()
     QVERIFY(torrent->exists);
 
     ModelsCollection<TorrentPreviewableFile> savedFiles;
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(QueryError,
                 savedFiles = torrent->torrentFiles()->createMany({{
                     {"file_index", 1},
                     {"filepath",   "test1_file1.mkv"},
@@ -723,8 +724,7 @@ tst_Relations_Inserting_Updating::createMany_OnHasOneOrMany_WithRValue_Failed()
                     {SIZE_,        377477},
                     {Progress,     222},
                     {NOTE,         "relation's save fail"},
-                }}),
-                QueryError);
+                }}));
     QVERIFY(savedFiles.isEmpty());
 }
 
@@ -837,8 +837,7 @@ void tst_Relations_Inserting_Updating::save_OnBelongsToMany_Failed() const
     Tag tag({{NAME, "tag1"}});
     QVERIFY(!tag.exists);
 
-    QVERIFY_EXCEPTION_THROWN(torrent->tags()->save(tag),
-                             QueryError);
+    TVERIFY_THROWS_EXCEPTION(QueryError, torrent->tags()->save(tag));
     QVERIFY(!tag.exists);
     QVERIFY(!tag[ID]->isValid());
 
@@ -1001,8 +1000,8 @@ void tst_Relations_Inserting_Updating::saveMany_OnBelongsToMany_Failed() const
 
     ModelsCollection<Tag> tagsToSave {std::move(tag1), std::move(tag2)};
     ModelsCollection<Tag> savedTags;
-    QVERIFY_EXCEPTION_THROWN(savedTags = torrent->tags()->saveMany(tagsToSave),
-                             QueryError);
+    TVERIFY_THROWS_EXCEPTION(QueryError,
+                             savedTags = torrent->tags()->saveMany(tagsToSave));
     QVERIFY(savedTags.isEmpty());
 
     size = torrent->tags()->get({ID}).size();
@@ -1114,8 +1113,8 @@ void tst_Relations_Inserting_Updating::create_OnBelongsToMany_Failed() const
     QVector<AttributeItem> tagAttributes {{NAME, "tag1"}};
     Tag tag;
 
-    QVERIFY_EXCEPTION_THROWN(tag = torrent->tags()->create(tagAttributes),
-                             QueryError);
+    TVERIFY_THROWS_EXCEPTION(QueryError,
+                             tag = torrent->tags()->create(tagAttributes));
     QVERIFY(!tag.exists);
     QVERIFY(tag.getAttributes().isEmpty());
 
@@ -1140,8 +1139,8 @@ void tst_Relations_Inserting_Updating::create_OnBelongsToMany_WithRValue_Failed(
 
     Tag tag;
 
-    QVERIFY_EXCEPTION_THROWN(tag = torrent->tags()->create({{NAME, "tag1"}}),
-                             QueryError);
+    TVERIFY_THROWS_EXCEPTION(QueryError,
+                             tag = torrent->tags()->create({{NAME, "tag1"}}));
     QVERIFY(!tag.exists);
     QVERIFY(tag.getAttributes().isEmpty());
 
@@ -1289,9 +1288,9 @@ void tst_Relations_Inserting_Updating::createMany_OnBelongsToMany_Failed() const
 
     ModelsCollection<Tag> tags;
 
-    QVERIFY_EXCEPTION_THROWN(tags = torrent->tags()->createMany(tagAttributes,
-                                                                {{{"active", false}}}),
-                             QueryError);
+    TVERIFY_THROWS_EXCEPTION(QueryError,
+                             tags = torrent->tags()->createMany(tagAttributes,
+                                                                {{{"active", false}}}));
     QVERIFY(tags.isEmpty());
 
     size = torrent->tags()->get({ID}).size();
@@ -1316,11 +1315,11 @@ tst_Relations_Inserting_Updating::createMany_OnBelongsToMany_WithRValue_Failed()
 
     ModelsCollection<Tag> tags;
 
-    QVERIFY_EXCEPTION_THROWN(tags = torrent->tags()->createMany({{{NAME, "tag1"}},
+    TVERIFY_THROWS_EXCEPTION(QueryError,
+                             tags = torrent->tags()->createMany({{{NAME, "tag1"}},
                                                                  {{NAME, "tag1"}}},
 
-                                                                {{{"active", false}}}),
-                             QueryError);
+                                                                {{{"active", false}}}));
     QVERIFY(tags.isEmpty());
 
     size = torrent->tags()->get({ID}).size();
diff --git a/tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp b/tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp
index d30c5b2bc..53d8316ee 100644
--- a/tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp
+++ b/tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp
@@ -2,6 +2,7 @@
 #include <QtTest>
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/torrent.hpp"
 
@@ -162,10 +163,10 @@ void tst_TinyBuilder::firstOrFail_NotFoundFailed() const
 
     ConnectionOverride::connection = connection;
 
-    QVERIFY_EXCEPTION_THROWN(Torrent::whereEq(ID, 999999)->firstOrFail(),
-                             ModelNotFoundError);
-    QVERIFY_EXCEPTION_THROWN(Torrent::whereEq(ID, 999999)->firstOrFail({ID, NAME}),
-                             ModelNotFoundError);
+    TVERIFY_THROWS_EXCEPTION(ModelNotFoundError,
+                             Torrent::whereEq(ID, 999999)->firstOrFail());
+    TVERIFY_THROWS_EXCEPTION(ModelNotFoundError,
+                             Torrent::whereEq(ID, 999999)->firstOrFail({ID, NAME}));
 }
 
 void tst_TinyBuilder::incrementAndDecrement() const
@@ -271,9 +272,9 @@ void tst_TinyBuilder::update_Failed() const
 
     ConnectionOverride::connection = connection;
 
-    QVERIFY_EXCEPTION_THROWN(
-                Torrent::whereEq(ID, 3)->update({{"progress-NON_EXISTENT", 333}}),
-                QueryError);
+    TVERIFY_THROWS_EXCEPTION(
+                QueryError,
+                Torrent::whereEq(ID, 3)->update({{"progress-NON_EXISTENT", 333}}));
 }
 
 void tst_TinyBuilder::update_SameValue() const
diff --git a/tests/auto/functional/tom/migrate/tst_migrate.cpp b/tests/auto/functional/tom/migrate/tst_migrate.cpp
index 6d999a049..a90f8e259 100644
--- a/tests/auto/functional/tom/migrate/tst_migrate.cpp
+++ b/tests/auto/functional/tom/migrate/tst_migrate.cpp
@@ -10,6 +10,7 @@
 #include "tom/commands/migrations/statuscommand.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "migrations/2014_10_12_000000_create_posts_table.hpp"
 #include "migrations/2014_10_12_100000_add_factor_column_to_posts_table.hpp"
diff --git a/tests/auto/unit/orm/databaseconnection/tst_databaseconnection.cpp b/tests/auto/unit/orm/databaseconnection/tst_databaseconnection.cpp
index b8c476de4..bb4856d22 100644
--- a/tests/auto/unit/orm/databaseconnection/tst_databaseconnection.cpp
+++ b/tests/auto/unit/orm/databaseconnection/tst_databaseconnection.cpp
@@ -10,6 +10,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using Orm::Constants::ID;
 using Orm::Constants::NAME;
@@ -867,9 +868,9 @@ void tst_DatabaseConnection::scalar_MultipleColumnsSelectedError() const
 {
     QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
 
-    QVERIFY_EXCEPTION_THROWN(DB::connection(connection).scalar(
-                                 "select id, name from torrents order by id"),
-                             MultipleColumnsSelectedError);
+    TVERIFY_THROWS_EXCEPTION(MultipleColumnsSelectedError,
+                             DB::connection(connection).scalar(
+                                 "select id, name from torrents order by id"));
 }
 // NOLINTEND(readability-convert-member-functions-to-static)
 
diff --git a/tests/auto/unit/orm/query/mysql_querybuilder/tst_mysql_querybuilder.cpp b/tests/auto/unit/orm/query/mysql_querybuilder/tst_mysql_querybuilder.cpp
index 9ce915abe..9120abd6c 100644
--- a/tests/auto/unit/orm/query/mysql_querybuilder/tst_mysql_querybuilder.cpp
+++ b/tests/auto/unit/orm/query/mysql_querybuilder/tst_mysql_querybuilder.cpp
@@ -7,6 +7,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using Orm::Constants::AND;
 using Orm::Constants::ASC;
@@ -3011,19 +3012,19 @@ void tst_MySql_QueryBuilder::whereRowValues() const
 void tst_MySql_QueryBuilder::whereRowValues_Empty() const
 {
     // Different size
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                InvalidArgumentError,
                 createQuery()->select("*").from("torrents")
-                .whereRowValues({NAME}, EQ, {"test3", 3}),
-                InvalidArgumentError);
-    QVERIFY_EXCEPTION_THROWN(
+                .whereRowValues({NAME}, EQ, {"test3", 3}));
+    TVERIFY_THROWS_EXCEPTION(
+            InvalidArgumentError,
             createQuery()->select("*").from("torrents")
-            .whereRowValues({}, EQ, {"test3", 3}),
-            InvalidArgumentError);
+            .whereRowValues({}, EQ, {"test3", 3}));
     // Empty columns/values
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+            InvalidArgumentError,
             createQuery()->select("*").from("torrents")
-            .whereRowValues({}, EQ, {}),
-            InvalidArgumentError);
+            .whereRowValues({}, EQ, {}));
 }
 
 void tst_MySql_QueryBuilder::whereRowValues_ColumnExpression() const
diff --git a/tests/auto/unit/orm/query/postgresql_querybuilder/tst_postgresql_querybuilder.cpp b/tests/auto/unit/orm/query/postgresql_querybuilder/tst_postgresql_querybuilder.cpp
index 6bc137b38..73a75e0cb 100644
--- a/tests/auto/unit/orm/query/postgresql_querybuilder/tst_postgresql_querybuilder.cpp
+++ b/tests/auto/unit/orm/query/postgresql_querybuilder/tst_postgresql_querybuilder.cpp
@@ -5,6 +5,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using Orm::Constants::AND;
 using Orm::Constants::ASC;
diff --git a/tests/auto/unit/orm/query/sqlite_querybuilder/tst_sqlite_querybuilder.cpp b/tests/auto/unit/orm/query/sqlite_querybuilder/tst_sqlite_querybuilder.cpp
index 739dd9d4e..6773a3b35 100644
--- a/tests/auto/unit/orm/query/sqlite_querybuilder/tst_sqlite_querybuilder.cpp
+++ b/tests/auto/unit/orm/query/sqlite_querybuilder/tst_sqlite_querybuilder.cpp
@@ -5,6 +5,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 using Orm::Constants::AND;
 using Orm::Constants::ASC;
diff --git a/tests/auto/unit/orm/schema/mysql_schemabuilder/tst_mysql_schemabuilder.cpp b/tests/auto/unit/orm/schema/mysql_schemabuilder/tst_mysql_schemabuilder.cpp
index d82a75ca5..c26b49521 100644
--- a/tests/auto/unit/orm/schema/mysql_schemabuilder/tst_mysql_schemabuilder.cpp
+++ b/tests/auto/unit/orm/schema/mysql_schemabuilder/tst_mysql_schemabuilder.cpp
@@ -7,6 +7,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #ifndef TINYORM_DISABLE_ORM
 #  include "models/user.hpp"
@@ -832,7 +833,7 @@ void tst_MySql_SchemaBuilder::renameColumn() const
 
 void tst_MySql_SchemaBuilder::dropAllTypes() const
 {
-    QVERIFY_EXCEPTION_THROWN(Schema::on(m_connection).dropAllTypes(), LogicError);
+    TVERIFY_THROWS_EXCEPTION(LogicError, Schema::on(m_connection).dropAllTypes());
 }
 
 void tst_MySql_SchemaBuilder::getAllTables() const
diff --git a/tests/auto/unit/orm/schema/postgresql_schemabuilder/tst_postgresql_schemabuilder.cpp b/tests/auto/unit/orm/schema/postgresql_schemabuilder/tst_postgresql_schemabuilder.cpp
index 86e9e1970..769be72f6 100644
--- a/tests/auto/unit/orm/schema/postgresql_schemabuilder/tst_postgresql_schemabuilder.cpp
+++ b/tests/auto/unit/orm/schema/postgresql_schemabuilder/tst_postgresql_schemabuilder.cpp
@@ -7,6 +7,7 @@
 #include "orm/utils/type.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #ifndef TINYORM_DISABLE_ORM
 #  include "models/user.hpp"
@@ -773,7 +774,7 @@ void tst_PostgreSQL_SchemaBuilder::renameColumn() const
 
 void tst_PostgreSQL_SchemaBuilder::dropAllTypes() const
 {
-    QVERIFY_EXCEPTION_THROWN(Schema::on(m_connection).dropAllTypes(), LogicError);
+    TVERIFY_THROWS_EXCEPTION(LogicError, Schema::on(m_connection).dropAllTypes());
 }
 
 void tst_PostgreSQL_SchemaBuilder::getAllTables() const
@@ -901,10 +902,10 @@ void tst_PostgreSQL_SchemaBuilder::hasTable_DatabaseDiffers_ThrowException() con
     // Verify
     DB::connection(m_connection).pretend([](auto &connection)
     {
-        QVERIFY_EXCEPTION_THROWN(
+        TVERIFY_THROWS_EXCEPTION(
+                    InvalidArgumentError,
                     Schema::on(connection.getName())
-                    .hasTable(sl("%1-database.public.users").arg(dummy_NONEXISTENT)),
-                    InvalidArgumentError);
+                    .hasTable(sl("%1-database.public.users").arg(dummy_NONEXISTENT)));
     });
 }
 
@@ -1049,8 +1050,8 @@ void tst_PostgreSQL_SchemaBuilder::
               .toUtf8().constData(), );
 
     // Create database connection
-    QVERIFY_EXCEPTION_THROWN(DB::connection(*connectionName),
-                             InvalidArgumentError);
+    TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
+                             DB::connection(*connectionName));
 
     // Restore
     QVERIFY(Databases::removeConnection(*connectionName));
@@ -2601,7 +2602,8 @@ void tst_PostgreSQL_SchemaBuilder::virtualAs_StoredAs_Nullable_ModifyTable() con
 
 void tst_PostgreSQL_SchemaBuilder::change_VirtualAs_ThrowException() const
 {
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                LogicError,
                 DB::connection(m_connection).pretend([](auto &connection)
     {
         Schema::on(connection.getName())
@@ -2612,13 +2614,13 @@ void tst_PostgreSQL_SchemaBuilder::change_VirtualAs_ThrowException() const
                exception, PostgreSQL doesn't support modifying generated columns. */
             table.integer("discounted_virtual").virtualAs("price - 5").change();
         });
-    }),
-                LogicError);
+    }));
 }
 
 void tst_PostgreSQL_SchemaBuilder::change_StoredAs_ThrowException() const
 {
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                LogicError,
                 DB::connection(m_connection).pretend([](auto &connection)
     {
         Schema::on(connection.getName())
@@ -2629,8 +2631,7 @@ void tst_PostgreSQL_SchemaBuilder::change_StoredAs_ThrowException() const
                exception, PostgreSQL doesn't support modifying generated columns. */
             table.integer("discounted_virtual").storedAs("price - 5").change();
         });
-    }),
-                LogicError);
+    }));
 }
 
 void tst_PostgreSQL_SchemaBuilder::drop_StoredAs() const
diff --git a/tests/auto/unit/orm/schema/sqlite_schemabuilder/tst_sqlite_schemabuilder.cpp b/tests/auto/unit/orm/schema/sqlite_schemabuilder/tst_sqlite_schemabuilder.cpp
index 51acec4f2..9cb685fc2 100644
--- a/tests/auto/unit/orm/schema/sqlite_schemabuilder/tst_sqlite_schemabuilder.cpp
+++ b/tests/auto/unit/orm/schema/sqlite_schemabuilder/tst_sqlite_schemabuilder.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #ifndef TINYORM_DISABLE_ORM
 #  include "models/user.hpp"
@@ -749,7 +750,7 @@ void tst_SQLite_SchemaBuilder::renameColumn() const
 
 void tst_SQLite_SchemaBuilder::dropAllTypes() const
 {
-    QVERIFY_EXCEPTION_THROWN(Schema::on(m_connection).dropAllTypes(), LogicError);
+    TVERIFY_THROWS_EXCEPTION(LogicError, Schema::on(m_connection).dropAllTypes());
 }
 
 void tst_SQLite_SchemaBuilder::getAllTables() const
@@ -1330,57 +1331,57 @@ void tst_SQLite_SchemaBuilder::indexes_Blueprint() const
 
 void tst_SQLite_SchemaBuilder::indexes_Fluent_Fulltext_SpatialIndex_Exceptions() const
 {
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                RuntimeError,
                 Schema::on(m_connection).create(Firewalls, [](Blueprint &table)
                 {
                     table.id();
 
                     table.string("name_f").fulltext();
-                }),
-                    RuntimeError);
+                }));
 
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                RuntimeError,
                 Schema::on(m_connection).create(Firewalls, [](Blueprint &table)
                 {
                     table.id();
 
                     table.geometry("coordinates_s").spatialIndex();
-                }),
-                    RuntimeError);
+                }));
 }
 
 void tst_SQLite_SchemaBuilder::indexes_Blueprint_Fulltext_SpatialIndex_Exceptions() const
 {
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                RuntimeError,
                 Schema::on(m_connection).create(Firewalls, [](Blueprint &table)
                 {
                     table.id();
 
                     table.string("name_f");
                     table.fullText({"name_f"});
-                }),
-                    RuntimeError);
+                }));
 
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                RuntimeError,
                 Schema::on(m_connection).create(Firewalls, [](Blueprint &table)
                 {
                     table.id();
 
                     table.geometry("coordinates_s").isGeometry();
                     table.spatialIndex("coordinates_s");
-                }),
-                    RuntimeError);
+                }));
 }
 
 void tst_SQLite_SchemaBuilder::renameIndex() const
 {
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                RuntimeError,
                 Schema::on(m_connection).table(Firewalls, [](Blueprint &table)
                 {
                     table.renameIndex("firewalls_name_unique",
                                       "firewalls_name_unique_renamed");
-                }),
-                    RuntimeError);
+                }));
 }
 
 void tst_SQLite_SchemaBuilder::dropIndex_ByIndexName() const
@@ -1560,34 +1561,34 @@ void tst_SQLite_SchemaBuilder::dropIndex_ByMultipleColumns() const
 
 void tst_SQLite_SchemaBuilder::dropPrimary_Exception() const
 {
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                RuntimeError,
                 Schema::on(m_connection).table(Firewalls, [](Blueprint &table)
                 {
                     table.dropPrimary();
-                }),
-                    RuntimeError);
+                }));
 }
 
 void tst_SQLite_SchemaBuilder::dropFullText_Exception() const
 {
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                RuntimeError,
                 Schema::on(m_connection).table(Firewalls, [](Blueprint &table)
                 {
                     // By column name
                     table.dropFullText({"name_f"});
-                }),
-                    RuntimeError);
+                }));
 }
 
 void tst_SQLite_SchemaBuilder::dropSpatialIndex_Exception() const
 {
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                RuntimeError,
                 Schema::on(m_connection).table(Firewalls, [](Blueprint &table)
                 {
                     // By index name
                     table.dropSpatialIndex("firewalls_coordinates_s_spatialindex");
-                }),
-                    RuntimeError);
+                }));
 }
 
 void tst_SQLite_SchemaBuilder::foreignKey() const
@@ -1704,13 +1705,13 @@ void tst_SQLite_SchemaBuilder::foreignKey_WithModel() const
 
 void tst_SQLite_SchemaBuilder::dropForeign() const
 {
-    QVERIFY_EXCEPTION_THROWN(
+    TVERIFY_THROWS_EXCEPTION(
+                RuntimeError,
                 Schema::on(m_connection).table(Firewalls, [](Blueprint &table)
                 {
                     // By column name
                     table.dropForeign({"user_id"});
-                }),
-                    RuntimeError);
+                }));
 }
 
 /* private */
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 24fe6390e..35b7ea640 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
@@ -6,6 +6,7 @@
 #include "orm/utils/nullvariant.hpp"
 
 #include "databases.hpp"
+#include "macros.hpp"
 
 #include "models/torrent.hpp"
 
@@ -924,8 +925,8 @@ void tst_MySql_TinyBuilder::has_UnsupportedHasNested_Failed() const
 {
     auto builder = createTinyQuery<Torrent>();
 
-    QVERIFY_EXCEPTION_THROWN(builder->has("torrentFiles.fileProperty"),
-                             InvalidArgumentError);
+    TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
+                             builder->has("torrentFiles.fileProperty"));
 }
 
 void tst_MySql_TinyBuilder::orHas_Basic_OnHasMany() const