diff --git a/ext/pdo/tests/bug_65946.phpt b/ext/pdo/tests/bug_65946.phpt
index ea73835502d89..9d0eeb156ef49 100644
--- a/ext/pdo/tests/bug_65946.phpt
+++ b/ext/pdo/tests/bug_65946.phpt
@@ -17,7 +17,12 @@ $db = PDOTest::factory();
 $db->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 $db->exec('CREATE TABLE test(id int)');
 $db->exec('INSERT INTO test VALUES(1)');
-switch ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) {
+
+$database = $db->getAttribute(PDO::ATTR_DRIVER_NAME);
+if ('odbc' === $database && 'MySQL' === $db->getAttribute(PDO::ATTR_SERVER_INFO))
+    $database = 'mysql';
+
+switch ($database) {
     case 'dblib':
         $sql = 'SELECT TOP :limit * FROM test';
         break;
diff --git a/ext/pdo/tests/pdo_039.phpt b/ext/pdo/tests/pdo_039.phpt
index 655d51c13be52..809697a6ff3f0 100644
--- a/ext/pdo/tests/pdo_039.phpt
+++ b/ext/pdo/tests/pdo_039.phpt
@@ -6,7 +6,7 @@ pdo
 <?php
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
-if (str_starts_with(getenv('PDOTEST_DSN'), "firebird")) die('xfail firebird driver does not behave as expected');
+if (str_starts_with(getenv('PDOTEST_DSN'), "firebird")) die('xfail firebird driver does not have empty initial errorCode');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>
diff --git a/ext/pdo_dblib/tests/types.phpt b/ext/pdo_dblib/tests/types.phpt
index 951e3b3e59afc..ef47385b45895 100644
--- a/ext/pdo_dblib/tests/types.phpt
+++ b/ext/pdo_dblib/tests/types.phpt
@@ -19,6 +19,8 @@ function get_expected_float_string() {
         case '7.0':
         case '7.1':
         case '7.2':
+        case '7.3':
+        case '7.4':
         case '8.0':
             return '10.500';
         default: