diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
index 2a3f13699e0..255418d159d 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
@@ -1080,8 +1080,8 @@ void tst_QSqlDatabase::bigIntField()
         QVERIFY_SQL(q, exec("create table " + qtest_bigint + "(id int, t_s64bit bigint, t_u64bit bigint)"));
     } else if (dbType == QSqlDriver::Oracle) {
         QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int, t_u64bit int)"));
-    //} else if (dbType == QSqlDriver::Interbase) {
-    //    QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int64, t_u64bit int64)"));
+    } else if (dbType == QSqlDriver::SQLite) {
+        QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int, t_u64bit int)"));
     } else {
         QSKIP("no 64 bit integer support");
     }
@@ -2312,6 +2312,10 @@ void tst_QSqlDatabase::cloneDatabase()
     QFETCH(QString, dbName);
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
+    const auto wrapup = qScopeGuard([&]() {
+        QSqlDatabase::removeDatabase("clonedDatabase");
+        QSqlDatabase::removeDatabase("clonedDatabaseCopy");
+    });
     {
         QSqlDatabase clonedDatabase = QSqlDatabase::cloneDatabase(db, "clonedDatabase");
         QCOMPARE(clonedDatabase.databaseName(), db.databaseName());
@@ -2353,6 +2357,7 @@ public slots:
         QSqlDatabase invalidDb = QSqlDatabase::database("invalid");
         QVERIFY(!invalidDb.isValid());
 
+        const auto wrapup = qScopeGuard([&]() { QSqlDatabase::removeDatabase("CloneDB"); });
         {
             QSqlDatabase clonedDatabase = QSqlDatabase::cloneDatabase(dbName, "CloneDB");
             QVERIFY(!clonedDatabase.isOpen());
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
index 3f2184b6b62..8f8a872da5c 100644
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
@@ -2920,6 +2920,7 @@ void tst_QSqlQuery::psql_specialFloatValues()
     CHECK_DATABASE(db);
     QSqlQuery query(db);
     const QString tableName = qTableName("floattest", __FILE__, db);
+    const auto wrapup = qScopeGuard([&]() { tst_Databases::safeDropTable(db, tableName); });
     QVERIFY_SQL(query, exec(QLatin1String("create table %1 (value float)").arg(tableName)));
     QVERIFY_SQL(query, prepare(QLatin1String("insert into %1 values(:value)").arg(tableName)));