diff --git a/tests/auto/functional/orm/schema/schemabuilder/tst_schemabuilder.cpp b/tests/auto/functional/orm/schema/schemabuilder/tst_schemabuilder.cpp
index af6da3c41..df198cef5 100644
--- a/tests/auto/functional/orm/schema/schemabuilder/tst_schemabuilder.cpp
+++ b/tests/auto/functional/orm/schema/schemabuilder/tst_schemabuilder.cpp
@@ -51,8 +51,8 @@ private Q_SLOTS:
     void hasTable() const;
 
     /* Blueprint commands */
-    void createTable_Comment() const;
-    void modifyTable_Comment() const;
+    void createTable_WithComment() const;
+    void modifyTable_WithComment() const;
 
 // NOLINTNEXTLINE(readability-redundant-access-specifiers)
 private:
@@ -268,7 +268,7 @@ void tst_SchemaBuilder::hasTable() const
 
 /* Blueprint commands */
 
-void tst_SchemaBuilder::createTable_Comment() const
+void tst_SchemaBuilder::createTable_WithComment() const
 {
     QFETCH_GLOBAL(QString, connection);
 
@@ -300,7 +300,7 @@ void tst_SchemaBuilder::createTable_Comment() const
     QVERIFY(!Schema::on(connection).hasTable(Firewalls));
 }
 
-void tst_SchemaBuilder::modifyTable_Comment() const
+void tst_SchemaBuilder::modifyTable_WithComment() const
 {
     QFETCH_GLOBAL(QString, connection);
 
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 8f31ccc0f..650390eee 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
@@ -51,13 +51,13 @@ private Q_SLOTS:
     void createTable() const;
     void createTable_Temporary() const;
     void createTable_Charset_Collation_Engine() const;
-    void createTable_Comment() const;
+    void createTable_WithComment() const;
 
     void timestamps_rememberToken_softDeletes_CreateAndDrop() const;
     void datetimes_softDeletesDatetime_CreateAndDrop() const;
 
     void modifyTable() const;
-    void modifyTable_Comment() const;
+    void modifyTable_WithComment() const;
 
     void dropTable() const;
     void dropTableIfExists() const;
@@ -438,7 +438,7 @@ void tst_MySql_SchemaBuilder::createTable_Charset_Collation_Engine() const
     QVERIFY(firstLog.boundValues.isEmpty());
 }
 
-void tst_MySql_SchemaBuilder::createTable_Comment() const
+void tst_MySql_SchemaBuilder::createTable_WithComment() const
 {
     auto log = DB::connection(m_connection).pretend([](auto &connection)
     {
@@ -696,7 +696,7 @@ void tst_MySql_SchemaBuilder::modifyTable() const
     QVERIFY(log5.boundValues.isEmpty());
 }
 
-void tst_MySql_SchemaBuilder::modifyTable_Comment() const
+void tst_MySql_SchemaBuilder::modifyTable_WithComment() const
 {
     auto log = DB::connection(m_connection).pretend([](auto &connection)
     {
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 7840ac391..f938da7ea 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
@@ -49,13 +49,13 @@ private Q_SLOTS:
     void createTable() const;
     void createTable_Temporary() const;
     void createTable_Charset_Collation_Engine() const;
-    void createTable_Comment() const;
+    void createTable_WithComment() const;
 
     void timestamps_rememberToken_softDeletes_CreateAndDrop() const;
     void datetimes_softDeletesDatetime_CreateAndDrop() const;
 
     void modifyTable() const;
-    void modifyTable_Comment() const;
+    void modifyTable_WithComment() const;
 
     void dropTable() const;
     void dropTableIfExists() const;
@@ -386,7 +386,7 @@ void tst_PostgreSQL_SchemaBuilder::createTable_Charset_Collation_Engine() const
     QVERIFY(firstLog.boundValues.isEmpty());
 }
 
-void tst_PostgreSQL_SchemaBuilder::createTable_Comment() const
+void tst_PostgreSQL_SchemaBuilder::createTable_WithComment() const
 {
     auto log = DB::connection(m_connection).pretend([](auto &connection)
     {
@@ -625,7 +625,7 @@ void tst_PostgreSQL_SchemaBuilder::modifyTable() const
     QVERIFY(log5.boundValues.isEmpty());
 }
 
-void tst_PostgreSQL_SchemaBuilder::modifyTable_Comment() const
+void tst_PostgreSQL_SchemaBuilder::modifyTable_WithComment() const
 {
     auto log = DB::connection(m_connection).pretend([](auto &connection)
     {
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 76102c00b..b73f103d6 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
@@ -56,7 +56,7 @@ private Q_SLOTS:
     void datetimes_softDeletesDatetime_CreateAndDrop() const;
 
     void modifyTable() const;
-    void modifyTable_Comment() const;
+    void modifyTable_WithComment() const;
 
     void dropTable() const;
     void dropTableIfExists() const;
@@ -576,7 +576,7 @@ void tst_SQLite_SchemaBuilder::modifyTable() const
     QVERIFY(log18.boundValues.isEmpty());
 }
 
-void tst_SQLite_SchemaBuilder::modifyTable_Comment() const
+void tst_SQLite_SchemaBuilder::modifyTable_WithComment() const
 {
     auto log = DB::connection(m_connection).pretend([](auto &connection)
     {